customize bootstrap for smaller font, and fix layout css glitches

This commit is contained in:
Oliver Gorwits
2012-08-27 19:07:23 +01:00
parent d0917fbd33
commit 4cd0c06567
7 changed files with 843 additions and 22 deletions

View File

@@ -11,7 +11,7 @@
* Re-engineer link generation to ensure sane defaults and remembered options. * Re-engineer link generation to ensure sane defaults and remembered options.
This came as a side-effect of removing JS-only links (closes #21) This came as a side-effect of removing JS-only links (closes #21)
* Replace jquery-collapser with Bootstrap's collapser * Replace jquery-collapser with Bootstrap's collapser
* Upgraded to Twitter Bootstrap 2.1.0 * Upgraded to Twitter Bootstrap 2.1.0 - customized for 13px font 18px line
[BUG FIXES] [BUG FIXES]

File diff suppressed because one or more lines are too long

View File

@@ -119,7 +119,7 @@ body {
.arrow-up { .arrow-up {
float: right; float: right;
margin-top: 6px; margin-top: 6px;
margin-right: 11px; margin-right: 1px;
border-left: 7px solid transparent; border-left: 7px solid transparent;
border-right: 7px solid transparent; border-right: 7px solid transparent;
border-bottom: 8px solid #F89406; border-bottom: 8px solid #F89406;
@@ -129,7 +129,7 @@ body {
.arrow-down { .arrow-down {
float: right; float: right;
margin-top: 6px; margin-top: 6px;
margin-right: 11px; margin-right: 1px;
border-left: 7px solid transparent; border-left: 7px solid transparent;
border-right: 7px solid transparent; border-right: 7px solid transparent;
border-top: 8px solid #F89406; border-top: 8px solid #F89406;
@@ -178,11 +178,16 @@ td {
/* fixups for prepended checkbox in sidebar */ /* fixups for prepended checkbox in sidebar */
.nd_searchcheckbox { .nd_searchcheckbox {
width: 120px; width: 123px;
padding-left: 35px; padding-left: 8px;
cursor: pointer; cursor: pointer;
} }
/* for some reason bootstrap 2.1.0 displays add-on as block - no check supprt? */
.nd_checkboxlabel {
display: inline;
}
/* fixups for placing the Archived "A" inside the prepended checkbox */ /* fixups for placing the Archived "A" inside the prepended checkbox */
.nd_legendlabel { .nd_legendlabel {
float: right; float: right;
@@ -190,14 +195,17 @@ td {
} }
.nd_side_input { .nd_side_input {
margin-left: -3px;
width: 152px; width: 152px;
} }
.nd_side_select { .nd_side_select {
width: 162px; margin-left: -3px;
width: 165px;
} }
.sidebar .input-prepend { .sidebar .input-prepend {
margin-left: -2px;
margin-bottom: 0px; margin-bottom: 0px;
} }
@@ -221,12 +229,13 @@ td {
/* sidebar submit button width and spacing from Node Props */ /* sidebar submit button width and spacing from Node Props */
.sidebar button { .sidebar button {
margin-top: 3px; margin-top: 9px;
width: 160px; margin-left: -3px;
width: 165px;
} }
.sidebar #ports_submit { .sidebar #ports_submit {
margin-top: 3px; margin-top: 9px;
width: 152px; width: 165px;
} }
/* little icon inside of search input fields */ /* little icon inside of search input fields */
@@ -322,6 +331,11 @@ form .clearfix.success input {
left: auto; left: auto;
} }
/* smaller padding below form button in sidebar well */
.container-fluid > .sidebar > .well {
padding-bottom: 15px;
}
/* make the content start more to the left now the sidebar is narrower */ /* make the content start more to the left now the sidebar is narrower */
.container-fluid > .content { .container-fluid > .content {
margin-right: 215px; margin-right: 215px;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -78,7 +78,7 @@
<input type="checkbox" id="matchall" <input type="checkbox" id="matchall"
name="matchall"[% ' checked="checked"' IF params.matchall %]/> name="matchall"[% ' checked="checked"' IF params.matchall %]/>
</label> </label>
<label for="matchall"> <label class="nd_checkboxlabel" for="matchall">
<span class="nd_searchcheckbox uneditable-input">Match All Options</span> <span class="nd_searchcheckbox uneditable-input">Match All Options</span>
</label> </label>
</div> </div>

View File

@@ -6,7 +6,7 @@
<input type="checkbox" id="stamps" <input type="checkbox" id="stamps"
name="stamps"[% ' checked="checked"' IF params.stamps %]/> name="stamps"[% ' checked="checked"' IF params.stamps %]/>
</label> </label>
<label for="stamps"> <label class="nd_checkboxlabel" for="stamps">
<span class="nd_searchcheckbox uneditable-input">Time Stamps</span> <span class="nd_searchcheckbox uneditable-input">Time Stamps</span>
</label> </label>
</div> </div>
@@ -15,7 +15,7 @@
<input type="checkbox" id="vendor" <input type="checkbox" id="vendor"
name="vendor"[% ' checked="checked"' IF params.vendor %]/> name="vendor"[% ' checked="checked"' IF params.vendor %]/>
</label> </label>
<label for="vendor"> <label class="nd_checkboxlabel" for="vendor">
<span class="nd_searchcheckbox uneditable-input">Vendor</span> <span class="nd_searchcheckbox uneditable-input">Vendor</span>
</label> </label>
</div> </div>
@@ -24,7 +24,7 @@
<input type="checkbox" id="archived" <input type="checkbox" id="archived"
name="archived"[% ' checked="checked"' IF params.archived %]/> name="archived"[% ' checked="checked"' IF params.archived %]/>
</label> </label>
<label for="archived"> <label class="nd_checkboxlabel" for="archived">
<span class="nd_searchcheckbox uneditable-input"> <span class="nd_searchcheckbox uneditable-input">
Archived Data <span class="nd_legendlabel label label-warning">A</span></span> Archived Data <span class="nd_legendlabel label label-warning">A</span></span>
</label> </label>
@@ -35,7 +35,7 @@
<input type="checkbox" id="partial" <input type="checkbox" id="partial"
name="partial"[% ' checked="checked"' IF params.partial %]/> name="partial"[% ' checked="checked"' IF params.partial %]/>
</label> </label>
<label for="partial"> <label class="nd_checkboxlabel" for="partial">
<span class="nd_searchcheckbox uneditable-input">Partial Name</span> <span class="nd_searchcheckbox uneditable-input">Partial Name</span>
</label> </label>
</div> </div>