瀏覽代碼

Fixing merge conflicts

tags/v1.0^2
Benjamin Attal 10 年之前
父節點
當前提交
465503bfa9
共有 2 個文件被更改,包括 34 次插入11 次删除
  1. +4
    -4
      static/sass/index.sass
  2. +30
    -7
      templates/index.html

+ 4
- 4
static/sass/index.sass 查看文件

@@ -312,8 +312,11 @@ div#results
height: inherit

tr

height: inherit

&.cascade
@extend .t3

div#display-info
font-size: 1.3em
padding: 5px 0px 5px 5px
@@ -404,6 +407,3 @@ div#hidden-info

&:hover
color: orange

&.cascade
@extend .t3

+ 30
- 7
templates/index.html 查看文件

@@ -20,13 +20,11 @@

= block body
<div id="search-field">
<a id="title" href="/">
<div id="title">
<span id="title-bit">bit</span
><span id="title-angle">&laquo;</span
><span id="title-shift">shift</span>
</div>
</a>
<div id="title">
<span id="title-bit">bit</span
><span id="title-angle">&laquo;</span
><span id="title-shift">shift</span>
</div>

<form id="search-bar">
<input type="text" name="query"
@@ -90,6 +88,31 @@
<span class="regex">Regex</span>
</div>
</div>

<div id="lower-half">
<ul>
<li>
<label for="symbols">Symbols</label>
<input type="text" name="symbols" id="symbols"><br>
</li>

<li>
<label for="functions">Functions</label>
<input type="text" name="functions" id="functions"><br>
</li>

<li>
<label for="classes">Classes</label>
<input type="text" name="classes" id="classes"><br>
</li>

<li>
<label for="variables">Variables</label>
<input type="text" name="variables" id="variables"><br>
</li>

</ul>
</div>
</div>
</div>
</form>


Loading…
取消
儲存