Skip to content

Commit 65659a6

Browse files
committed
Updating LESS files using Bootstrap.
1 parent 0a6bb1a commit 65659a6

5 files changed

Lines changed: 185 additions & 64 deletions

File tree

_less/bootswatch/bootstrap-core.less

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
// Components
1919
@import "../../_bower_components/bootstrap/less/component-animations.less";
20-
//@import "../../_bower_components/bootstrap/less/glyphicons.less";
2120
@import "../../_bower_components/bootstrap/less/dropdowns.less";
2221
@import "../../_bower_components/bootstrap/less/button-groups.less";
2322
@import "../../_bower_components/bootstrap/less/input-groups.less";
@@ -35,8 +34,10 @@
3534
@import "../../_bower_components/bootstrap/less/media.less";
3635
@import "../../_bower_components/bootstrap/less/list-group.less";
3736
@import "../../_bower_components/bootstrap/less/panels.less";
37+
@import "../../_bower_components/bootstrap/less/responsive-embed.less";
3838
@import "../../_bower_components/bootstrap/less/wells.less";
3939
@import "../../_bower_components/bootstrap/less/close.less";
40+
// Components
4041

4142
// Components w/ JavaScript
4243
@import "../../_bower_components/bootstrap/less/modals.less";

_less/bootswatch/bootstrap-cyborg-util.less

Lines changed: 49 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
// Cyborg 3.2.0
1+
// Cyborg 3.3.1
22
// Bootswatch
33
// -----------------------------------------------------
44

5-
@import url("//fonts.googleapis.com/css?family=Droid+Sans:400,700");
5+
@import url("//fonts.googleapis.com/css?family=Roboto:400,700");
66

77
// Navbar =====================================================================
88

9-
.navbar {
10-
11-
border-bottom: 1px solid @gray-dark;
12-
}
13-
149
// Buttons ====================================================================
1510

1611
// Typography =================================================================
@@ -46,11 +41,15 @@ table,
4641
.table {
4742
color: #fff;
4843

49-
a {
44+
a:not(.btn) {
5045
color: #fff;
5146
text-decoration: underline;
5247
}
5348

49+
.dropdown-menu a {
50+
text-decoration: none;
51+
}
52+
5453
.text-muted {
5554
color: @text-muted;
5655
}
@@ -161,6 +160,48 @@ a.thumbnail.active {
161160
border-color: @thumbnail-border;
162161
}
163162

163+
a.list-group-item {
164+
165+
&.active,
166+
&.active:hover,
167+
&.active:focus {
168+
border-color: @list-group-border;
169+
}
170+
171+
&-success {
172+
&.active {
173+
background-color: @state-success-bg;
174+
}
175+
176+
&.active:hover,
177+
&.active:focus {
178+
background-color: darken(@state-success-bg, 5%);
179+
}
180+
}
181+
182+
&-warning {
183+
&.active {
184+
background-color: @state-warning-bg;
185+
}
186+
187+
&.active:hover,
188+
&.active:focus {
189+
background-color: darken(@state-warning-bg, 5%);
190+
}
191+
}
192+
193+
&-danger {
194+
&.active {
195+
background-color: @state-danger-bg;
196+
}
197+
198+
&.active:hover,
199+
&.active:focus {
200+
background-color: darken(@state-danger-bg, 5%);
201+
}
202+
}
203+
}
204+
164205
.jumbotron {
165206

166207
h1, h2, h3, h4, h5, h6 {

_less/bootswatch/bootstrap-cyborg-var.less

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Cyborg 3.2.0
1+
// Cyborg 3.3.1
22
// Variables
33
// --------------------------------------------------
44

@@ -7,6 +7,7 @@
77
//
88
//## Gray and brand colors for use across Bootstrap.
99

10+
@gray-base: #000;
1011
@gray-darker: #222; // #222
1112
@gray-dark: #282828; // #333
1213
@gray: #555; // #555
@@ -33,13 +34,15 @@
3334
@link-color: @brand-primary;
3435
//** Link hover color set via `darken()` function.
3536
@link-hover-color: @link-color;
37+
//** Link hover decoration.
38+
@link-hover-decoration: underline;
3639

3740

3841
//== Typography
3942
//
4043
//## Font, line-height, and color for body text, headings, and more.
4144

42-
@font-family-sans-serif: "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
45+
@font-family-sans-serif: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
4346
@font-family-serif: Georgia, "Times New Roman", Times, serif;
4447
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
4548
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
@@ -49,12 +52,12 @@
4952
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
5053
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
5154

52-
@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
53-
@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
54-
@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
55-
@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
56-
@font-size-h5: @font-size-base;
57-
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
55+
@font-size-h1: 56px;
56+
@font-size-h2: 45px;
57+
@font-size-h3: 34px;
58+
@font-size-h4: 24px;
59+
@font-size-h5: 20px;
60+
@font-size-h6: 16px;
5861

5962
//** Unit-less `line-height` for use in components like buttons.
6063
@line-height-base: 1.428571429; // 20/14
@@ -181,8 +184,15 @@
181184
@input-color: @text-color;
182185
//** `<input>` border color
183186
@input-border: @gray-dark;
184-
//** `<input>` border radius
187+
188+
// TODO: Rename `@input-border-radius` to `@input-border-radius-base` in v4
189+
//** Default `.form-control` border radius
185190
@input-border-radius: @border-radius-base;
191+
//** Large `.form-control` border radius
192+
@input-border-radius-large: @border-radius-large;
193+
//** Small `.form-control` border radius
194+
@input-border-radius-small: @border-radius-small;
195+
186196
//** Border color for inputs on focus
187197
@input-border-focus: #66afe9;
188198

@@ -204,6 +214,9 @@
204214
//** Border color for textual input addons
205215
@input-group-addon-border-color: @input-border;
206216

217+
//** Disabled cursor for form controls and buttons.
218+
@cursor-disabled: not-allowed;
219+
207220

208221
//== Dropdowns
209222
//
@@ -223,18 +236,18 @@
223236
//** Hover color for dropdown links.
224237
@dropdown-link-hover-color: #fff;
225238
//** Hover background for dropdown links.
226-
@dropdown-link-hover-bg: @dropdown-link-active-bg;
239+
@dropdown-link-hover-bg: @component-active-bg;
227240

228241
//** Active dropdown menu item text color.
229242
@dropdown-link-active-color: #fff;
230243
//** Active dropdown menu item background color.
231244
@dropdown-link-active-bg: @component-active-bg;
232245

233246
//** Disabled dropdown menu item background color.
234-
@dropdown-link-disabled-color: @text-muted;
247+
@dropdown-link-disabled-color: @gray-light;
235248

236249
//** Text color for headers within dropdown menus.
237-
@dropdown-header-color: @text-muted;
250+
@dropdown-header-color: @gray-light;
238251

239252
//** Deprecated `@dropdown-caret-color` as of v3.1.0
240253
@dropdown-caret-color: #000;
@@ -252,8 +265,7 @@
252265
@zindex-popover: 1060;
253266
@zindex-tooltip: 1070;
254267
@zindex-navbar-fixed: 1030;
255-
@zindex-modal-background: 1040;
256-
@zindex-modal: 1050;
268+
@zindex-modal: 1040;
257269

258270

259271
//== Media queries breakpoints
@@ -315,17 +327,17 @@
315327
//## Define the maximum width of `.container` for different screen sizes.
316328

317329
// Small screen / tablet
318-
@container-tablet: ((720px + @grid-gutter-width));
330+
@container-tablet: (720px + @grid-gutter-width);
319331
//** For `@screen-sm-min` and up.
320332
@container-sm: @container-tablet;
321333

322334
// Medium screen / desktop
323-
@container-desktop: ((940px + @grid-gutter-width));
335+
@container-desktop: (940px + @grid-gutter-width);
324336
//** For `@screen-md-min` and up.
325337
@container-md: @container-desktop;
326338

327339
// Large screen / wide desktop
328-
@container-large-desktop: ((1140px + @grid-gutter-width));
340+
@container-large-desktop: (1140px + @grid-gutter-width);
329341
//** For `@screen-lg-min` and up.
330342
@container-lg: @container-large-desktop;
331343

@@ -344,7 +356,7 @@
344356

345357
@navbar-default-color: @text-color;
346358
@navbar-default-bg: @body-bg;
347-
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
359+
@navbar-default-border: @gray-dark;
348360

349361
// Navbar links
350362
@navbar-default-link-color: @text-color;
@@ -403,8 +415,6 @@
403415
@nav-disabled-link-color: @gray-light;
404416
@nav-disabled-link-hover-color: @gray-light;
405417

406-
@nav-open-link-hover-color: @gray-darker;
407-
408418
//== Tabs
409419
@nav-tabs-border-color: @gray-dark;
410420

@@ -628,6 +638,8 @@
628638
@progress-bg: @gray-darker;
629639
//** Progress bar text color
630640
@progress-bar-color: #fff;
641+
//** Variable for setting rounded corners on progress bar.
642+
@progress-border-radius: @border-radius-base;
631643

632644
//** Default progress bar color
633645
@progress-bar-bg: @brand-primary;
@@ -687,11 +699,11 @@
687699

688700
//** Border color for elements within panels
689701
@panel-inner-border: @gray-dark;
690-
@panel-footer-bg: @panel-default-heading-bg;
702+
@panel-footer-bg: lighten(@gray-darker, 10%);
691703

692704
@panel-default-text: @text-color;
693705
@panel-default-border: @panel-inner-border;
694-
@panel-default-heading-bg: lighten(@gray-darker, 10%);
706+
@panel-default-heading-bg: @panel-footer-bg;
695707

696708
@panel-primary-text: #fff;
697709
@panel-primary-border: @brand-primary;
@@ -842,5 +854,3 @@
842854
@dl-horizontal-offset: @component-offset-horizontal;
843855
//** Horizontal line color.
844856
@hr-border: @gray-dark;
845-
846-

0 commit comments

Comments
 (0)