diff --git a/app/assets/js/start.js b/app/assets/js/start.js index 3bf2bea8..0dab65cc 100644 --- a/app/assets/js/start.js +++ b/app/assets/js/start.js @@ -4,4 +4,6 @@ $(function() { $('.wrapper').toggleClass('active'); }); + $('[data-toggle="tooltip"]').tooltip(); + }); diff --git a/app/assets/sass/modules/_bootstrap.scss b/app/assets/sass/modules/_bootstrap.scss new file mode 100644 index 00000000..06759e23 --- /dev/null +++ b/app/assets/sass/modules/_bootstrap.scss @@ -0,0 +1,52 @@ +// Bootstrap variable overrides and custom variables +@import "variables"; + +// Core variables and mixins +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/variables"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/mixins"; + +// Reset and dependencies +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/normalize"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/print"; + +// Core CSS +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/scaffolding"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/type"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/code"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/grid"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/tables"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/forms"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/buttons"; + +// Components +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/component-animations"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/dropdowns"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/button-groups"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/input-groups"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/navs"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/navbar"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/breadcrumbs"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/pagination"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/pager"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/labels"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/badges"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/jumbotron"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/thumbnails"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/alerts"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/progress-bars"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/media"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/list-group"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/panels"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/responsive-embed"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/wells"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/close"; + +// Components w/ JavaScript +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/modals"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/tooltip"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/popovers"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/carousel"; + +// Utility classes +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/utilities"; +@import "../../bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/responsive-utilities"; diff --git a/app/assets/sass/modules/_forms.scss b/app/assets/sass/modules/_forms.scss index 643da5dd..294d32fc 100644 --- a/app/assets/sass/modules/_forms.scss +++ b/app/assets/sass/modules/_forms.scss @@ -1,3 +1,7 @@ +label { + font-size: 14px; +} + .form-control { @include box-shadow(none); } diff --git a/app/assets/sass/modules/_variables.scss b/app/assets/sass/modules/_variables.scss new file mode 100644 index 00000000..7598630c --- /dev/null +++ b/app/assets/sass/modules/_variables.scss @@ -0,0 +1,5 @@ +$brand-success: #7ed321 !default; + +//** Tooltip background color +$tooltip-bg: #333 !default; +$tooltip-opacity: .9 !default; diff --git a/app/assets/sass/partials/_content.scss b/app/assets/sass/partials/_content.scss index 645aea9b..bfccc5ec 100644 --- a/app/assets/sass/partials/_content.scss +++ b/app/assets/sass/partials/_content.scss @@ -52,5 +52,13 @@ body.dashboard { font-weight: 300; text-transform: uppercase; } + + .striped-list { + + .striped-list-item { + border-bottom: 1px solid #f0f0f0; + padding: 8px 0; + } + } } } diff --git a/app/assets/sass/partials/_sidebar.scss b/app/assets/sass/partials/_sidebar.scss index f16d9487..cef1343c 100644 --- a/app/assets/sass/partials/_sidebar.scss +++ b/app/assets/sass/partials/_sidebar.scss @@ -6,7 +6,7 @@ body.dashboard { background: $sidebar-background-color; @include box-shadow($sidebar-border-shadow); position: relative; - z-index: 100; + z-index: 999; .sidebar-inner { position: relative; @@ -71,5 +71,25 @@ body.dashboard { } } } + .bottom-menu-sidebar { + position: fixed; + bottom: 0; + width: 230px; + z-index: 999; + ul > li { + float: left; + display: block; + width: 33.333%; + border-right: 1px solid #D1DFEC; + border-top: 1px solid #D1DFEC; + a { + display: block; + position: relative; + text-align: center; + padding: 6px 0; + background: #E8EFF6; + } + } + } } } diff --git a/app/lang/en/cachet.php b/app/lang/en/cachet.php index 866937a9..05222c07 100644 --- a/app/lang/en/cachet.php +++ b/app/lang/en/cachet.php @@ -48,6 +48,7 @@ return [ 'toggle_navigation' => 'Toggle Navigation', 'search' => 'Search...', 'user' => 'User', + 'help' => 'Help', ], // Forms 'forms' => [ diff --git a/app/views/dashboard/component-edit.blade.php b/app/views/dashboard/component-edit.blade.php index e00da3d9..6dfd556c 100644 --- a/app/views/dashboard/component-edit.blade.php +++ b/app/views/dashboard/component-edit.blade.php @@ -1,44 +1,50 @@ @extends('layout.dashboard') @section('content') -
{{ $component->description }}
- @endif -