diff options
author | elijah <elijah@riseup.net> | 2013-06-17 01:26:35 -0700 |
---|---|---|
committer | elijah <elijah@riseup.net> | 2013-06-17 01:26:35 -0700 |
commit | 8b7621793fe5f8fa55c955045a71821c53d4759f (patch) | |
tree | 872071d4fd3510d319288b32aeb8cdcdcf741a22 /app/assets | |
parent | 15d48c24e529e2f944b026749c5eb35eb4c5cfa7 (diff) |
start of new ui - css changes, layout changes, navigation changes.
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/stylesheets/application.scss | 17 | ||||
-rw-r--r-- | app/assets/stylesheets/leap.scss | 65 |
2 files changed, 71 insertions, 11 deletions
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index bb3b8bc..298a758 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,23 +1,18 @@ // // import custom scss, content to be set in deployment. // -@import "tail"; +@import "head"; // // import bootstrap. // @import "bootstrap"; -body { - padding: 40px; -} @import "bootstrap-responsive"; -table.table-hover .btn { - opacity: 0; -} -table.table-hover tr:hover .btn { - opacity: 1; -} -@import "bootstrap-editable"; + +// +// LEAP web app specific overrides +// +@import "leap"; // // import custom scss, content to be set in deployment. diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss new file mode 100644 index 0000000..42638eb --- /dev/null +++ b/app/assets/stylesheets/leap.scss @@ -0,0 +1,65 @@ + +table.table-hover .btn { + opacity: 0; +} +table.table-hover tr:hover .btn { + opacity: 1; +} + +.debug { + outline: 1px solid red; +} + +// +// Icons +// + + +// force a black icon, even if bootstrap thinks differently +.icon-black { + background-image: url(/assets/glyphicons-halflings.png) !important; +} + +// +// Typography +// + +.first { + margin-top: 0; + padding-top: 0; +} + +// +// Boring default masthead +// + +#masthead { + background: #eee; + margin-bottom: 10px; + border-bottom: 1px solid #e6e6e6; + .title { + padding: 20px; + font-size: 1.25em; + } + .sitename { + font-weight: bold; + } +} + +// +// Side Navigation +// + +.sidenav { + @extend .nav-tabs; + @extend .nav-stacked; + box-shadow: 0 2px 4px rgba(0,0,0,.1); + li.active { + a, a:hover { + background-color: $blueDark; + color: $white; + border-color: darken($blueDark, 10%); + cursor: pointer; + } + } +} |