Skip to content

GitLab

Commit d5a05962 authored by Thomas Park's avatar Thomas Park
Browse files

journal: add navbar states and improve panel style

parent d7813166
Hide whitespace changes
Inline Side-by-side
journal/bootstrap.css
View file @ d5a05962
......@@ -4978,7 +4978,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-default .navbar-brand:hover,
.navbar-default .navbar-brand:focus {
color: #000000;
background-color: transparent;
background-color: #eeeeee;
}
.navbar-default .navbar-text {
......@@ -4992,14 +4992,14 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-default .navbar-nav > li > a:hover,
.navbar-default .navbar-nav > li > a:focus {
color: #000000;
background-color: transparent;
background-color: #eeeeee;
}
.navbar-default .navbar-nav > .active > a,
.navbar-default .navbar-nav > .active > a:hover,
.navbar-default .navbar-nav > .active > a:focus {
color: #000000;
background-color: transparent;
background-color: #eeeeee;
}
.navbar-default .navbar-nav > .disabled > a,
......@@ -5037,7 +5037,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-default .navbar-nav > .open > a:hover,
.navbar-default .navbar-nav > .open > a:focus {
color: #000000;
background-color: transparent;
background-color: #eeeeee;
}
.navbar-default .navbar-nav > .open > a .caret,
......@@ -5059,13 +5059,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
.navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
color: #000000;
background-color: transparent;
background-color: #eeeeee;
}
.navbar-default .navbar-nav .open .dropdown-menu > .active > a,
.navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #000000;
background-color: transparent;
background-color: #eeeeee;
}
.navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
.navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
......@@ -5095,7 +5095,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-inverse .navbar-brand:hover,
.navbar-inverse .navbar-brand:focus {
color: #ffffff;
background-color: transparent;
background-color: #e74b47;
}
.navbar-inverse .navbar-text {
......@@ -5109,14 +5109,14 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-inverse .navbar-nav > li > a:hover,
.navbar-inverse .navbar-nav > li > a:focus {
color: #ffffff;
background-color: transparent;
background-color: #e74b47;
}
.navbar-inverse .navbar-nav > .active > a,
.navbar-inverse .navbar-nav > .active > a:hover,
.navbar-inverse .navbar-nav > .active > a:focus {
color: #ffffff;
background-color: transparent;
background-color: #e74b47;
}
.navbar-inverse .navbar-nav > .disabled > a,
......@@ -5148,7 +5148,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-inverse .navbar-nav > .open > a:hover,
.navbar-inverse .navbar-nav > .open > a:focus {
color: #ffffff;
background-color: transparent;
background-color: #e74b47;
}
.navbar-inverse .navbar-nav > .dropdown > a:hover .caret {
......@@ -5178,13 +5178,13 @@ textarea.input-group-sm > .input-group-btn > .btn {
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
.navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
color: #ffffff;
background-color: transparent;
background-color: #e74b47;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
.navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
color: #ffffff;
background-color: transparent;
background-color: #e74b47;
}
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
.navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
......@@ -6181,17 +6181,17 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-success {
border-color: #d6e9c6;
border-color: #22b24c;
}
.panel-success > .panel-heading {
color: #468847;
background-color: #dff0d8;
border-color: #d6e9c6;
background-color: #22b24c;
border-color: #22b24c;
}
.panel-success > .panel-heading + .panel-collapse .panel-body {
border-top-color: #d6e9c6;
border-top-color: #22b24c;
}
.panel-success > .panel-heading > .dropdown .caret {
......@@ -6199,21 +6199,21 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-success > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #d6e9c6;
border-bottom-color: #22b24c;
}
.panel-warning {
border-color: #fbeed5;
border-color: #f5e625;
}
.panel-warning > .panel-heading {
color: #c09853;
background-color: #fcf8e3;
border-color: #fbeed5;
background-color: #f5e625;
border-color: #f5e625;
}
.panel-warning > .panel-heading + .panel-collapse .panel-body {
border-top-color: #fbeed5;
border-top-color: #f5e625;
}
.panel-warning > .panel-heading > .dropdown .caret {
......@@ -6221,21 +6221,21 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-warning > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #fbeed5;
border-bottom-color: #f5e625;
}
.panel-danger {
border-color: #eed3d7;
border-color: #f57a00;
}
.panel-danger > .panel-heading {
color: #b94a48;
background-color: #f2dede;
border-color: #eed3d7;
background-color: #f57a00;
border-color: #f57a00;
}
.panel-danger > .panel-heading + .panel-collapse .panel-body {
border-top-color: #eed3d7;
border-top-color: #f57a00;
}
.panel-danger > .panel-heading > .dropdown .caret {
......@@ -6243,21 +6243,21 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-danger > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #eed3d7;
border-bottom-color: #f57a00;
}
.panel-info {
border-color: #bce8f1;
border-color: #336699;
}
.panel-info > .panel-heading {
color: #3a87ad;
background-color: #d9edf7;
border-color: #bce8f1;
background-color: #336699;
border-color: #336699;
}
.panel-info > .panel-heading + .panel-collapse .panel-body {
border-top-color: #bce8f1;
border-top-color: #336699;
}
.panel-info > .panel-heading > .dropdown .caret {
......@@ -6265,7 +6265,7 @@ a.list-group-item.active:focus .list-group-item-text {
}
.panel-info > .panel-footer + .panel-collapse .panel-body {
border-bottom-color: #bce8f1;
border-bottom-color: #336699;
}
.well {
......@@ -7543,6 +7543,14 @@ td.visible-print {
color: #000;
}
.panel-primary .panel-title,
.panel-success .panel-title,
.panel-warning .panel-title,
.panel-danger .panel-title,
.panel-info .panel-title {
color: #fff;
}
.clearfix:before,
.clearfix:after {
display: table;
......
journal/bootstrap.min.css
View file @ d5a05962
This source diff could not be displayed because it is too large. You can view the blob instead.
journal/bootswatch.less
View file @ d5a05962
......@@ -85,4 +85,19 @@
font-weight: @headings-font-weight;
color: #000;
}
}
\ No newline at end of file
}
.panel {
&-primary,
&-success,
&-warning,
&-danger,
&-info {
.panel-title {
color: #fff;
}
}
}
journal/variables.less
View file @ d5a05962
......@@ -267,16 +267,16 @@
// Navbar links
@navbar-default-link-color: #000;
@navbar-default-link-hover-color: #000;
@navbar-default-link-hover-bg: transparent;
@navbar-default-link-hover-bg: darken(@navbar-default-bg, 6.5%);
@navbar-default-link-active-color: #000;
@navbar-default-link-active-bg: transparent;
@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);
@navbar-default-link-disabled-color: #ccc;
@navbar-default-link-disabled-bg: transparent;
// Navbar brand label
@navbar-default-brand-color: @navbar-default-link-color;
@navbar-default-brand-hover-color: @navbar-default-link-hover-color;
@navbar-default-brand-hover-bg: transparent;
@navbar-default-brand-hover-bg: darken(@navbar-default-bg, 6.5%);
// Navbar toggle
@navbar-default-toggle-hover-bg: #ddd;
......@@ -294,16 +294,16 @@
// Inverted navbar links
@navbar-inverse-link-color: #fff;
@navbar-inverse-link-hover-color: #fff;
@navbar-inverse-link-hover-bg: transparent;
@navbar-inverse-link-hover-bg: darken(@navbar-inverse-bg, 6.5%);
@navbar-inverse-link-active-color: #fff;
@navbar-inverse-link-active-bg: transparent;
@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 6.5%);
@navbar-inverse-link-disabled-color: #444;
@navbar-inverse-link-disabled-bg: transparent;
// Inverted navbar brand label
@navbar-inverse-brand-color: @navbar-inverse-link-color;
@navbar-inverse-brand-hover-color: #fff;
@navbar-inverse-brand-hover-bg: transparent;
@navbar-inverse-brand-hover-bg: darken(@navbar-inverse-bg, 6.5%);
// Inverted navbar toggle
@navbar-inverse-toggle-hover-bg: darken(@navbar-inverse-bg, 10%);
......@@ -515,20 +515,20 @@
@panel-primary-heading-bg: @brand-primary;
@panel-success-text: @state-success-text;
@panel-success-border: @state-success-border;
@panel-success-heading-bg: @state-success-bg;
@panel-success-border: @brand-success;
@panel-success-heading-bg: @brand-success;
@panel-warning-text: @state-warning-text;
@panel-warning-border: @state-warning-border;
@panel-warning-heading-bg: @state-warning-bg;
@panel-warning-border: @brand-warning;
@panel-warning-heading-bg: @brand-warning;
@panel-danger-text: @state-danger-text;
@panel-danger-border: @state-danger-border;
@panel-danger-heading-bg: @state-danger-bg;
@panel-danger-border: @brand-danger;
@panel-danger-heading-bg: @brand-danger;
@panel-info-text: @state-info-text;
@panel-info-border: @state-info-border;
@panel-info-heading-bg: @state-info-bg;
@panel-info-border: @brand-info;
@panel-info-heading-bg: @brand-info;
// Thumbnails
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment