diff --git a/design/custom.css b/design/custom.css index c9b58c5f7d6368cb1cbf9e04d364349690d67acc..8910d370aa1f6d7d79a9598796ae3c1fadee1c69 100644 --- a/design/custom.css +++ b/design/custom.css @@ -24,8 +24,8 @@ } .round { .border-radius(10px); } * - * Other features include mathematical operations, extend/inheritance, import of - * partials and more. + * Other features include mathematical operations, extend/inheritance, import + * of partials and more. * * If we still don't have you convinced, then simply put your good ol' CSS in * this file and it will be automatically included in Vanilla. diff --git a/design/style.css b/design/style.css index fb5171226f541be8c9caf490edfa4d3df95249c2..87c2a5bee6da5ab7ee6b34f2376d3a8f5ed8f2e9 100644 --- a/design/style.css +++ b/design/style.css @@ -1,7 +1,17 @@ /*! - * Vanilla Bootstrap + * Bootstrap for Vanilla * - * Written by Kasper Kronborg + * Based on Bootstrap v3.1.0 - Copyright 2011-2014 Twitter, Inc. + * + * Both Bootstrap and Bootstrap for Vanilla are licensed under the terms of the + * MIT License (http://opensource.org/licenses/MIT) + * + * Massive kudos to @fat and @mdo for their work on Bootstrap - without them, + * there never would have been a Bootstrap for Vanilla! + * + * @author Kasper Isager <kasperisager@gmail.com> + * @license http://opensource.org/licenses/MIT MIT + * @copyright 2014 © Kasper Kronborg Isager */ /*! normalize.css v3.0.0 | MIT License | git.io/normalize */ html { @@ -1621,7 +1631,8 @@ output { .form-control, .InputBox, .TextBox, -select { +select, +.token-input-list { display: block; width: 100%; height: 34px; @@ -1638,7 +1649,8 @@ select { -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; } -.form-control:focus { +.form-control:focus, +.token-input-focused { border-color: #66afe9; outline: 0; -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6); @@ -1982,6 +1994,17 @@ form ol { font-weight: normal; cursor: pointer; } +.token-input-list { + list-style: none; +} +.token-input-input-token { + display: inline-block; + margin-bottom: 0 !important; +} +.token-input-input-token input { + background-color: transparent; + border: 0; +} .Button, .NavButton { display: inline-block; @@ -2791,7 +2814,8 @@ a.Bookmarked:before { content: "\e006"; } .MenuItems, -.FlyoutMenu { +.FlyoutMenu, +.token-input-dropdown { position: absolute; top: 100%; left: 0; @@ -2811,15 +2835,15 @@ a.Bookmarked:before { box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); background-clip: padding-box; } -.MenuItems li > hr, -.FlyoutMenu li > hr { +.MenuItems li > hr { height: 1px; margin: 9px 0; overflow: hidden; background-color: #e5e5e5; } .MenuItems li > a, -.FlyoutMenu li > a { +.token-input-dropdown li, +.token-input-dropdown > p { display: block; padding: 3px 20px; clear: both; @@ -2829,29 +2853,61 @@ a.Bookmarked:before { white-space: nowrap; } .MenuItems li > a:hover, -.FlyoutMenu li > a:hover, .MenuItems li > a:focus, -.FlyoutMenu li > a:focus { +.token-input-dropdown li:hover { text-decoration: none; color: #262626; background-color: #f5f5f5; } -.Open > .MenuItems, -.Open > .FlyoutMenu { +.token-input-dropdown .token-input-selected-dropdown-item, +.token-input-dropdown .token-input-selected-dropdown-item:hover { + color: #ffffff; + text-decoration: none; + outline: 0; + background-color: #428bca; +} +.Open > .MenuItems { display: block; } -.OptionsMenu .MenuItems { +.OptionsMenu .MenuItems, +.MeBox .MenuItems, +.MeBox .FlyoutMenu { left: auto; right: 0; } -.MenuItems ul, +.MenuItems ul { + padding: 0; + list-style: none; +} +.MenuItems li > hr { + border: 0; +} +.FlyoutMenu { + min-width: 280px; +} .FlyoutMenu ul { padding: 0; list-style: none; } -.MenuItems li > hr, -.FlyoutMenu li > hr { +.FlyoutMenu .Item { + padding: 6px 12px; + border-bottom: #e5e5e5 solid 1px; +} +.FlyoutMenu .Item.Title { + padding: 0 12px 6px; +} +.FlyoutMenu .Item.Title a { + float: right; +} +.FlyoutMenu .Item.Center { + border-bottom-width: 0; +} +.FlyoutMenu .Item.Empty { + margin-bottom: 0; + background-color: transparent; border: 0; + border-radius: 0; + box-shadow: none; } .ToggleFlyout { position: relative; @@ -2869,6 +2925,24 @@ a.Bookmarked:before { .OptionsMenu.Open .SpFlyoutHandle { color: #428bca; } +.token-input-dropdown { + padding-right: 12px; + padding-left: 12px; + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +.token-input-dropdown ul { + padding: 0; + margin: 0 -12px; + list-style: none; +} +.token-input-dropdown li { + cursor: pointer; +} +.token-input-dropdown > p { + margin: 0 -12px; +} .ButtonGroup { position: relative; display: inline-block; @@ -2895,7 +2969,11 @@ a.Bookmarked:before { .nav > li > a:hover, .nav > li > a:focus, .FilterMenu li > a:hover, -.FilterMenu li > a:focus { +.FilterMenu li > a:focus, +.MeBox .Username:hover, +.MeBox .FlyoutButton:hover, +.MeBox .Username:focus, +.MeBox .FlyoutButton:focus { text-decoration: none; background-color: #eeeeee; } @@ -3348,7 +3426,9 @@ a.Bookmarked:before { margin-right: -15px; } } -.navbar-nav > li > .dropdown-menu { +.navbar-nav > li > .dropdown-menu, +.MeBox .MenuItems, +.MeBox .FlyoutMenu { margin-top: 0; border-top-right-radius: 0; border-top-left-radius: 0; @@ -3398,17 +3478,26 @@ a.Bookmarked:before { .navbar-default .navbar-text { color: #777777; } -.navbar-default .navbar-nav > li > a { +.navbar-default .navbar-nav > li > a, +.navbar-default .MeBox .Username, +.navbar-default .MeBox .FlyoutButton { color: #777777; } .navbar-default .navbar-nav > li > a:hover, -.navbar-default .navbar-nav > li > a:focus { +.navbar-default .navbar-nav > li > a:focus, +.navbar-default .MeBox .Username:hover, +.navbar-default .MeBox .FlyoutButton:hover, +.navbar-default .MeBox .Username:focus, +.navbar-default .MeBox .FlyoutButton:focus { color: #333333; background-color: transparent; } .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, -.navbar-default .navbar-nav > .active > a:focus { +.navbar-default .navbar-nav > .active > a:focus, +.navbar-default .MeBox .Open .FlyoutButton, +.navbar-default .MeBox .Open .FlyoutButton:hover, +.navbar-default .MeBox .Open .FlyoutButton:focus { color: #555555; background-color: #e7e7e7; } @@ -3481,17 +3570,26 @@ a.Bookmarked:before { .navbar-inverse .navbar-text { color: #999999; } -.navbar-inverse .navbar-nav > li > a { +.navbar-inverse .navbar-nav > li > a, +.navbar-inverse .MeBox .Username, +.navbar-inverse .MeBox .FlyoutButton { color: #999999; } .navbar-inverse .navbar-nav > li > a:hover, -.navbar-inverse .navbar-nav > li > a:focus { +.navbar-inverse .navbar-nav > li > a:focus, +.navbar-inverse .MeBox .Username:hover, +.navbar-inverse .MeBox .FlyoutButton:hover, +.navbar-inverse .MeBox .Username:focus, +.navbar-inverse .MeBox .FlyoutButton:focus { color: #ffffff; background-color: transparent; } .navbar-inverse .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, -.navbar-inverse .navbar-nav > .active > a:focus { +.navbar-inverse .navbar-nav > .active > a:focus, +.navbar-inverse .MeBox .Open .FlyoutButton, +.navbar-inverse .MeBox .Open .FlyoutButton:hover, +.navbar-inverse .MeBox .Open .FlyoutButton:focus { color: #ffffff; background-color: #080808; } @@ -4005,6 +4103,13 @@ buttona.Delete { .DataTable > tbody > tr > td { vertical-align: middle; } +.PopList .ItemContent { + overflow: hidden; +} +.PopList .ProfilePhoto { + width: 32px; + height: 32px; +} .MessageList { position: relative; } @@ -4081,17 +4186,17 @@ buttona.Delete { margin-bottom: 20px; margin-left: 64px; } -.MeBox .PhotoWrap, +.MeBox > .PhotoWrap, .MeBox .WhoIs, .MeBox .Username, .MeBox .MeMenu { float: left; } -.MeBox .PhotoWrap { +.MeBox > .PhotoWrap { margin-top: 9px; margin-bottom: 9px; } -.MeBox .PhotoWrap img { +.MeBox > .PhotoWrap img { width: 32px; height: 32px; vertical-align: top; @@ -4105,6 +4210,25 @@ buttona.Delete { .MeBox .ToggleFlyout .Arrow { display: none; } +.Section-Profile .ProfileOptions { + float: right; +} +.Section-Profile dl.About dt, +.Section-Profile dl.About dd { + display: inline-block; +} +.Section-Profile dl.About dt { + margin-left: 5px; +} +.Section-Profile dl.About dt:first-child { + margin-left: 0; +} +.Section-Profile dl.About dd { + margin-right: 5px; +} +.Section-Profile dl.About dd:last-child { + margin-right: 0; +} .clearfix:before, .clearfix:after, .container:before, @@ -4371,6 +4495,3 @@ td.visible-print { .Hidden { display: none; } -.Trace { - display: none; -} diff --git a/gulpfile.js b/gulpfile.js index 34d01b597ccf3509d1d5c12d91a878fed81bc3f8..b9eba89af9fb5da8cb5e234481c22d08c7f6667e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -7,7 +7,7 @@ var gulp = require('gulp') , livereload = require('gulp-livereload'); gulp.task('less', function () { - gulp.src('less/style.less') + gulp.src('less/core/style.less') .pipe(less({ paths: 'bower_components'}) .on('error', gutil.log)) .pipe(gulp.dest('design')) diff --git a/less/components/dropdowns.less b/less/components/dropdowns.less deleted file mode 100644 index 77ad6c73306c5fe7d37af41a84539e9bad49fcb0..0000000000000000000000000000000000000000 --- a/less/components/dropdowns.less +++ /dev/null @@ -1,62 +0,0 @@ -// -// # Dropdowns -// -// No styleguide reference. - -@import (reference) "@{bootstrap}/dropdowns"; - -.MenuItems, -.FlyoutMenu { - &:extend(.dropdown-menu); - - ul { - padding: 0; - list-style: none; - } - - li > a { - &:extend(.dropdown-menu > li > a); - - &:hover, - &:focus { - &:extend(.dropdown-menu > li > a:hover); - } - } - - li > hr { - border: 0; - &:extend(.dropdown-menu .divider); - } - - .Open > & { - &:extend(.open > .dropdown-menu); - } -} - -.ToggleFlyout { - position: relative; -} - -.OptionsMenu { - .OptionsTitle { - display: none; - } - - .SpFlyoutHandle { - cursor: pointer; - &:extend(.text-muted); - - &:hover, - &:focus { - color: @link-color; - } - } - - &.Open .SpFlyoutHandle { - color: @link-color; - } - - .MenuItems { - &:extend(.dropdown-menu-right); - } -} diff --git a/less/components/navbar.less b/less/components/navbar.less deleted file mode 100644 index ffb3a805e900763b58bc25a72699a88a578e7d1b..0000000000000000000000000000000000000000 --- a/less/components/navbar.less +++ /dev/null @@ -1,6 +0,0 @@ -// -// # Navbar -// -// No styleguide reference. - -@import (once) "@{bootstrap}/navbar"; diff --git a/less/components/vanilla/mebox.less b/less/components/vanilla/mebox.less deleted file mode 100644 index a30b4150d4af781140ea643f96aa59da7eae9fa5..0000000000000000000000000000000000000000 --- a/less/components/vanilla/mebox.less +++ /dev/null @@ -1,46 +0,0 @@ -// # MeBox -// -// No styleguide reference. - -.MeBox { - &:extend(.clearfix all); - - .PhotoWrap, - .WhoIs, - .Username, - .MeMenu { - float: left; - } - - .PhotoWrap { - .navbar-vertical-align(32px); - - img { - width: 32px; - height: 32px; - vertical-align: top; - } - } - - .Username, - .FlyoutButton { - &:extend(.nav > li > a); - &:extend(.navbar-nav > li > a); - } - - .MeMenu { - &:extend(.clearfix all); - } - - .ToggleFlyout { - float: left; - - em { - display: none; - } - - .Arrow { - display: none; - } - } -} diff --git a/less/components/badges.less b/less/core/components/badges.less similarity index 100% rename from less/components/badges.less rename to less/core/components/badges.less diff --git a/less/components/button-groups.less b/less/core/components/button-groups.less similarity index 100% rename from less/components/button-groups.less rename to less/core/components/button-groups.less diff --git a/less/components/close.less b/less/core/components/close.less similarity index 100% rename from less/components/close.less rename to less/core/components/close.less diff --git a/less/core/components/dropdowns.less b/less/core/components/dropdowns.less new file mode 100644 index 0000000000000000000000000000000000000000..7fea229ffcae640b7aa9f2d8bfeaf8a68eae6def --- /dev/null +++ b/less/core/components/dropdowns.less @@ -0,0 +1,142 @@ +// +// # Dropdowns +// +// No styleguide reference. + +// Library +// ----------------------------------------------------------------------------- + +@import (reference) "@{bootstrap}/dropdowns"; + + +// Extensions +// ----------------------------------------------------------------------------- + +.MenuItems { + &:extend(.dropdown-menu); + + ul { + padding: 0; + list-style: none; + } + + li > a { + &:extend(.dropdown-menu > li > a); + + &:hover, + &:focus { + &:extend(.dropdown-menu > li > a:hover); + } + } + + li > hr { + border: 0; + &:extend(.dropdown-menu .divider); + } + + .Open > & { + &:extend(.open > .dropdown-menu); + } +} + +.FlyoutMenu { + min-width: 280px; + &:extend(.dropdown-menu); + + ul { + padding: 0; + list-style: none; + } + + .Item { + padding: @padding-base-vertical @padding-base-horizontal; + border-bottom: @dropdown-divider-bg solid 1px; + + &.Title { + padding: 0 @padding-base-horizontal @padding-base-vertical; + + a { + float: right; + } + } + + &.Center { + border-bottom-width: 0; + } + + &.Empty { + margin-bottom: 0; + background-color: transparent; + border: 0; + border-radius: 0; + box-shadow: none; + } + } +} + +.ToggleFlyout { + position: relative; +} + +.OptionsMenu { + .OptionsTitle { + display: none; + } + + .SpFlyoutHandle { + cursor: pointer; + &:extend(.text-muted); + + &:hover, + &:focus { + color: @link-color; + } + } + + &.Open .SpFlyoutHandle { + color: @link-color; + } + + .MenuItems { + &:extend(.dropdown-menu-right); + } +} + +// Typeahead + +.token-input-dropdown { + padding-right: @padding-base-horizontal; + padding-left: @padding-base-horizontal; + .box-sizing(content-box); + &:extend(.dropdown-menu); + + ul { + padding: 0; + margin: 0 -@padding-base-horizontal; + list-style: none; + } + + li { + cursor: pointer; + + &:hover { + &:extend(.dropdown-menu > li > a:hover); + } + } + + > p { + margin: 0 -@padding-base-horizontal; + } + + li, + > p { + &:extend(.dropdown-menu > li > a); + } + + .token-input-selected-dropdown-item { + &, + &:hover { + &:extend(.dropdown-menu > .active > a); + } + } +} diff --git a/less/components/glyphicons.less b/less/core/components/glyphicons.less similarity index 99% rename from less/components/glyphicons.less rename to less/core/components/glyphicons.less index 092cdd2ba322ea3908edd119d6d813879196354b..a689db15bb29d920034df15e687378a28160a72f 100644 --- a/less/components/glyphicons.less +++ b/less/core/components/glyphicons.less @@ -1,3 +1,4 @@ +// // # Glyphicons // // No styleguide reference. diff --git a/less/components/labels.less b/less/core/components/labels.less similarity index 100% rename from less/components/labels.less rename to less/core/components/labels.less diff --git a/less/components/list-group.less b/less/core/components/list-group.less similarity index 100% rename from less/components/list-group.less rename to less/core/components/list-group.less diff --git a/less/components/modals.less b/less/core/components/modals.less similarity index 100% rename from less/components/modals.less rename to less/core/components/modals.less diff --git a/less/core/components/navbar.less b/less/core/components/navbar.less new file mode 100644 index 0000000000000000000000000000000000000000..ff50274320aaed0080ae6d7adf72a4b29b665b16 --- /dev/null +++ b/less/core/components/navbar.less @@ -0,0 +1,9 @@ +// +// # Navbar +// +// No styleguide reference. + +// Library +// ----------------------------------------------------------------------------- + +@import (once) "@{bootstrap}/navbar"; diff --git a/less/components/navs.less b/less/core/components/navs.less similarity index 100% rename from less/components/navs.less rename to less/core/components/navs.less diff --git a/less/components/pagination.less b/less/core/components/pagination.less similarity index 100% rename from less/components/pagination.less rename to less/core/components/pagination.less diff --git a/less/components/panels.less b/less/core/components/panels.less similarity index 65% rename from less/components/panels.less rename to less/core/components/panels.less index d42b35c851bb2138406b5ffaaf5b1d2dfd9d53fc..f263c144deb4b11fa987e968f4a90b51b842c79e 100644 --- a/less/components/panels.less +++ b/less/core/components/panels.less @@ -7,7 +7,3 @@ // ----------------------------------------------------------------------------- @import (reference) "@{bootstrap}/panels"; - - -// Extensions -// ----------------------------------------------------------------------------- \ No newline at end of file diff --git a/less/components/vanilla/avatars.less b/less/core/components/vanilla/avatars.less similarity index 100% rename from less/components/vanilla/avatars.less rename to less/core/components/vanilla/avatars.less diff --git a/less/components/vanilla/discussion.less b/less/core/components/vanilla/discussion.less similarity index 100% rename from less/components/vanilla/discussion.less rename to less/core/components/vanilla/discussion.less diff --git a/less/components/vanilla/listings.less b/less/core/components/vanilla/listings.less similarity index 94% rename from less/components/vanilla/listings.less rename to less/core/components/vanilla/listings.less index 696c0b1cd11f8e7b14baac43bbdb327de41b71f6..3c12fa44423ef749a8e5eebb3c51eed498b07eac 100644 --- a/less/components/vanilla/listings.less +++ b/less/core/components/vanilla/listings.less @@ -37,6 +37,17 @@ } } +.PopList { + .ItemContent { + overflow: hidden; + } + + .ProfilePhoto { + width: 32px; + height: 32px; + } +} + .MessageList { position: relative; &:extend(.list-group); diff --git a/less/core/components/vanilla/mebox.less b/less/core/components/vanilla/mebox.less new file mode 100644 index 0000000000000000000000000000000000000000..532205cf4694dee7120dcb186fe496849778f19f --- /dev/null +++ b/less/core/components/vanilla/mebox.less @@ -0,0 +1,85 @@ +// # MeBox +// +// No styleguide reference. + +.MeBox { + &:extend(.clearfix all); + + > .PhotoWrap, + .WhoIs, + .Username, + .MeMenu { + float: left; + } + + > .PhotoWrap { + .navbar-vertical-align(32px); + + img { + width: 32px; + height: 32px; + vertical-align: top; + } + } + + .Username, + .FlyoutButton { + &:extend(.nav > li > a); + &:extend(.navbar-nav > li > a); + + .navbar-default & { + &:extend(.navbar-default .navbar-nav > li > a); + } + .navbar-inverse & { + &:extend(.navbar-inverse .navbar-nav > li > a); + } + + &:hover, + &:focus { + &:extend(.nav > li > a:hover); + &:extend(.navbar-nav > li > a:hover); + + .navbar-default & { + &:extend(.navbar-default .navbar-nav > li > a:hover); + } + .navbar-inverse & { + &:extend(.navbar-inverse .navbar-nav > li > a:hover); + } + } + } + + .Open .FlyoutButton { + &, + &:hover, + &:focus { + .navbar-default & { + &:extend(.navbar-default .navbar-nav > .active > a); + } + .navbar-inverse & { + &:extend(.navbar-inverse .navbar-nav > .active > a); + } + } + } + + .MeMenu { + &:extend(.clearfix all); + } + + .MenuItems, + .FlyoutMenu { + &:extend(.dropdown-menu-right); + &:extend(.navbar-nav > li > .dropdown-menu); + } + + .ToggleFlyout { + float: left; + + em { + display: none; + } + + .Arrow { + display: none; + } + } +} diff --git a/less/core/globals/mixins.less b/less/core/globals/mixins.less new file mode 100644 index 0000000000000000000000000000000000000000..488605fa5f042af6c12584e4ec826fcd9d1e0231 --- /dev/null +++ b/less/core/globals/mixins.less @@ -0,0 +1,9 @@ +// +// # Mixins +// +// No styleguide reference. + +// Library +// ----------------------------------------------------------------------------- + +@import (reference) "@{bootstrap}/mixins"; diff --git a/less/core/globals/variables.less b/less/core/globals/variables.less new file mode 100644 index 0000000000000000000000000000000000000000..c3fbf2674c52a87aa52c71a22fcfca7aad78a0a1 --- /dev/null +++ b/less/core/globals/variables.less @@ -0,0 +1,19 @@ +// +// # Variables +// +// No styleguide reference. + +// Library +// ----------------------------------------------------------------------------- + +@import (reference) "@{bootstrap}/variables"; + + +// Extensions +// ----------------------------------------------------------------------------- + +@icon-font-path: "fonts/"; + +// Custom variables + +@import (reference) "variables"; diff --git a/less/core/sections/profile.less b/less/core/sections/profile.less new file mode 100644 index 0000000000000000000000000000000000000000..173e49b45f5be28077d0de58bc69cabb9c107962 --- /dev/null +++ b/less/core/sections/profile.less @@ -0,0 +1,33 @@ +// +// # Profile +// +// No styleguide reference. + +.Section-Profile { + .ProfileOptions { + float: right; + } + + dl.About { + dt, + dd { + display: inline-block; + } + + dt { + margin-left: 5px; + + &:first-child { + margin-left: 0; + } + } + + dd { + margin-right: 5px; + + &:last-child { + margin-right: 0; + } + } + } +} diff --git a/less/shared/buttons.less b/less/core/shared/buttons.less similarity index 100% rename from less/shared/buttons.less rename to less/core/shared/buttons.less diff --git a/less/shared/forms.less b/less/core/shared/forms.less similarity index 60% rename from less/shared/forms.less rename to less/core/shared/forms.less index 360756c130022a283060575e71fec995dec2d98f..841b63152c79655b179c1d37ad8b3e7128149136 100644 --- a/less/shared/forms.less +++ b/less/core/shared/forms.less @@ -3,8 +3,15 @@ // // No styleguide reference. +// Library +// ----------------------------------------------------------------------------- + @import (once) "@{bootstrap}/forms"; + +// Extensions +// ----------------------------------------------------------------------------- + .InputBox, .TextBox, select { @@ -54,5 +61,26 @@ form .P { } .RadioLabel input[type="radio"], .CheckBoxLabel input[type="checkbox"] { - &:extend(.radio input[type="radio"]); + &:extend(.radio input[type="radio"]); +} + +// Typeahead + +.token-input-list { + list-style: none; + &:extend(.form-control); +} + +.token-input-focused { + &:extend(.form-control:focus); +} + +.token-input-input-token { + display: inline-block; + margin-bottom: 0 !important; + + input { + background-color: transparent; + border: 0; + } } diff --git a/less/core/shared/grid.less b/less/core/shared/grid.less new file mode 100644 index 0000000000000000000000000000000000000000..5ef61221b887cddabd9ff5fd24105d3276b20436 --- /dev/null +++ b/less/core/shared/grid.less @@ -0,0 +1,9 @@ +// +// # Grid +// +// No styleguide reference. + +// Library +// ----------------------------------------------------------------------------- + +@import (once) "@{bootstrap}/grid"; diff --git a/less/shared/scaffolding.less b/less/core/shared/scaffolding.less similarity index 100% rename from less/shared/scaffolding.less rename to less/core/shared/scaffolding.less diff --git a/less/shared/tables.less b/less/core/shared/tables.less similarity index 100% rename from less/shared/tables.less rename to less/core/shared/tables.less diff --git a/less/core/shared/type.less b/less/core/shared/type.less new file mode 100644 index 0000000000000000000000000000000000000000..fbb474edd447c9e8be96663fcf6c9a2f063256b0 --- /dev/null +++ b/less/core/shared/type.less @@ -0,0 +1,9 @@ +// +// # Type +// +// No styleguide reference. + +// Library +// ----------------------------------------------------------------------------- + +@import (once) "@{bootstrap}/type"; diff --git a/less/shared/utilities.less b/less/core/shared/utilities.less similarity index 100% rename from less/shared/utilities.less rename to less/core/shared/utilities.less diff --git a/less/core/style.less b/less/core/style.less new file mode 100644 index 0000000000000000000000000000000000000000..f395cf7f64b41b231c01a4ecef539a18162bad66 --- /dev/null +++ b/less/core/style.less @@ -0,0 +1,69 @@ +/*! + * Bootstrap for Vanilla + * + * Based on Bootstrap v3.1.0 - Copyright 2011-2014 Twitter, Inc. + * + * Both Bootstrap and Bootstrap for Vanilla are licensed under the terms of the + * MIT License (http://opensource.org/licenses/MIT) + * + * Massive kudos to @fat and @mdo for their work on Bootstrap - without them, + * there never would have been a Bootstrap for Vanilla! + * + * @author Kasper Isager <kasperisager@gmail.com> + * @license http://opensource.org/licenses/MIT MIT + * @copyright 2014 © Kasper Kronborg Isager + */ + +// WARNING: DO NOT EDIT THIS FILE OR ANY OTHER FILES WITHIN THIS DIRECTORY + +// Library paths +// ----------------------------------------------------------------------------- +@bootstrap: "bootstrap/less"; + +// Globals +// ----------------------------------------------------------------------------- +@import "core/globals/variables"; +@import "core/globals/mixins"; + +// Shared +// ----------------------------------------------------------------------------- +@import "core/shared/scaffolding"; +@import "core/shared/type"; +@import "core/shared/grid"; +@import "core/shared/tables"; +@import "core/shared/forms"; +@import "core/shared/buttons"; + +// Components +// ----------------------------------------------------------------------------- +@import "core/components/glyphicons"; +@import "core/components/dropdowns"; +@import "core/components/button-groups"; +@import "core/components/navs"; +@import "core/components/navbar"; +@import "core/components/pagination"; +@import "core/components/labels"; +@import "core/components/badges"; +@import "core/components/list-group"; +@import "core/components/panels"; +@import "core/components/close"; +@import "core/components/modals"; + +// Vanilla Components +@import "core/components/vanilla/avatars"; +@import "core/components/vanilla/discussion"; +@import "core/components/vanilla/listings"; +@import "core/components/vanilla/mebox"; + +// Sections +// ----------------------------------------------------------------------------- +@import "core/sections/profile"; + +// Shared Utilities +// ----------------------------------------------------------------------------- +// These must be loaded last to ensure proper specificity. +@import "core/shared/utilities"; + +// Customizations +// ----------------------------------------------------------------------------- +@import "custom"; diff --git a/less/custom.less b/less/custom.less new file mode 100644 index 0000000000000000000000000000000000000000..870c07591c18d3629f784fc7dd34941cee678449 --- /dev/null +++ b/less/custom.less @@ -0,0 +1,4 @@ +// +// # Customizations +// +// No styleguide reference. diff --git a/less/globals/mixins.less b/less/globals/mixins.less deleted file mode 100644 index db1198bd393401106b53d1cf9c6015568b59afb2..0000000000000000000000000000000000000000 --- a/less/globals/mixins.less +++ /dev/null @@ -1,6 +0,0 @@ -// -// # Mixins -// -// No styleguide reference. - -@import (reference) "@{bootstrap}/mixins"; diff --git a/less/globals/variables.less b/less/globals/variables.less deleted file mode 100644 index a32fbac1bc86f0989f7ec8fe7020dc29687b76e2..0000000000000000000000000000000000000000 --- a/less/globals/variables.less +++ /dev/null @@ -1,8 +0,0 @@ -// -// # Variables -// -// No styleguide reference. - -@import (reference) "@{bootstrap}/variables"; - -@icon-font-path: "fonts/"; diff --git a/less/shared/grid.less b/less/shared/grid.less deleted file mode 100644 index e081dfda911fda647eee83e1cce7e622d575c5eb..0000000000000000000000000000000000000000 --- a/less/shared/grid.less +++ /dev/null @@ -1,6 +0,0 @@ -// -// # Grid -// -// No styleguide reference. - -@import (once) "@{bootstrap}/grid"; diff --git a/less/shared/type.less b/less/shared/type.less deleted file mode 100644 index d1c6c1c76e26fd13d100eabcaf431c73fbf57bee..0000000000000000000000000000000000000000 --- a/less/shared/type.less +++ /dev/null @@ -1,6 +0,0 @@ -// -// # Type -// -// No styleguide reference. - -@import (once) "@{bootstrap}/type"; diff --git a/less/style.less b/less/style.less deleted file mode 100644 index 1a95d8d97f66e3813c8d0a1320b45b40a987ac5a..0000000000000000000000000000000000000000 --- a/less/style.less +++ /dev/null @@ -1,55 +0,0 @@ -/*! - * Vanilla Bootstrap - * - * Written by Kasper Kronborg - */ - - -// Library paths -// ----------------------------------------------------------------------------- -@bootstrap: "bootstrap/less"; - -// Globals -// ----------------------------------------------------------------------------- -@import "globals/variables"; -@import "globals/mixins"; - -// Shared -// ----------------------------------------------------------------------------- -@import "shared/scaffolding"; -@import "shared/type"; -@import "shared/grid"; -@import "shared/tables"; -@import "shared/forms"; -@import "shared/buttons"; - -// Components -// ----------------------------------------------------------------------------- -@import "components/glyphicons"; -@import "components/dropdowns"; -@import "components/button-groups"; -@import "components/navs"; -@import "components/navbar"; -@import "components/pagination"; -@import "components/labels"; -@import "components/badges"; -@import "components/list-group"; -@import "components/panels"; -@import "components/close"; - -@import "components/modals"; - -// Vanilla Components -@import "components/vanilla/avatars"; -@import "components/vanilla/discussion"; -@import "components/vanilla/listings"; -@import "components/vanilla/mebox"; - -// Shared Utilities -// ----------------------------------------------------------------------------- -// These must be loaded last to ensure proper specificity. -@import "shared/utilities"; - - - -.Trace { display: none; } diff --git a/less/variables.less b/less/variables.less new file mode 100644 index 0000000000000000000000000000000000000000..ca1c6a618304c4fd7f7b416bb4e3e378be86b23a --- /dev/null +++ b/less/variables.less @@ -0,0 +1,9 @@ +// +// # Variables +// +// All your variable overrides as well as any custom variables you might end up +// writing should be put in this file. It is imported right after all the core +// variables so it will override both variables set by Bootstrap itself as well +// as variable overrides made by the theme. +// +// No styleguide reference. diff --git a/views/default.master.tpl b/views/default.master.tpl index 8b4ffb241405acc9583539fb0f04427c26843c94..7a30c198b5f3c079093632e337687f82da0036b5 100644 --- a/views/default.master.tpl +++ b/views/default.master.tpl @@ -14,7 +14,7 @@ <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> <![endif]--> </head> - <body> + <body id="{$BodyID}" class="{$BodyClass}"> <div class="page-wrap"> @@ -39,7 +39,7 @@ {activity_link} </ul> <ul class="nav navbar-nav navbar-right"> - {module name="MeModule"} + {module name="MeModule" CssClass="hidden-xs"} </ul> </div><!--/.nav-collapse --> </div>