Merge branch 'ui-improvements' into 'master'
Ui improvements
This commit is contained in:
commit
0759266c15
12 changed files with 69 additions and 48 deletions
|
@ -8,8 +8,6 @@
|
|||
*= require select2
|
||||
*= require highlightjs.min
|
||||
*= require_self
|
||||
*= require nprogress
|
||||
*= require nprogress-bootstrap
|
||||
*= require dropzone/basic
|
||||
*/
|
||||
|
||||
|
@ -20,6 +18,12 @@
|
|||
*/
|
||||
@import 'gl_bootstrap';
|
||||
|
||||
/**
|
||||
* NProgress load bar css
|
||||
*/
|
||||
@import 'nprogress';
|
||||
@import 'nprogress-bootstrap';
|
||||
|
||||
/**
|
||||
* Font icons
|
||||
*
|
||||
|
|
|
@ -55,7 +55,7 @@ pre {
|
|||
|
||||
.dropdown-menu > li > a:hover,
|
||||
.dropdown-menu > li > a:focus {
|
||||
background: $bg_style_color;
|
||||
background: $bg_primary;
|
||||
color: #FFF
|
||||
}
|
||||
|
||||
|
|
|
@ -76,30 +76,10 @@ label {
|
|||
}
|
||||
}
|
||||
|
||||
.commit-message-container {
|
||||
background-color: $body-bg;
|
||||
position: relative;
|
||||
font-family: $monospace_font;
|
||||
$left: 12px;
|
||||
.max-width-marker {
|
||||
width: 72ch;
|
||||
color: rgba(0, 0, 0, 0.0);
|
||||
font-family: inherit;
|
||||
left: $left;
|
||||
height: 100%;
|
||||
border-right: 1px solid mix($input-border, white);
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
}
|
||||
> textarea {
|
||||
background-color: rgba(0, 0, 0, 0.0);
|
||||
font-family: inherit;
|
||||
padding-left: $left;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
||||
.fieldset-form fieldset {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.form-control {
|
||||
@include box-shadow(none);
|
||||
}
|
||||
|
|
|
@ -41,8 +41,8 @@
|
|||
}
|
||||
|
||||
.ui-state-active {
|
||||
border: 1px solid $bg_style_color;
|
||||
background: $bg_style_color;
|
||||
border: 1px solid $bg_primary;
|
||||
background: $bg_primary;
|
||||
color: #FFF;
|
||||
}
|
||||
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
.select2-results {
|
||||
max-height: 350px;
|
||||
.select2-highlighted {
|
||||
background: $bg_style_color;
|
||||
background: $bg_primary;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
$font-size-base: 13px !default;
|
||||
$nav-pills-active-link-hover-bg: $bg_primary;
|
||||
$pagination-active-bg: $bg_primary;
|
||||
$list-group-active-bg: $bg_style_color;
|
||||
$list-group-active-bg: $bg_primary;
|
||||
|
||||
// Core variables and mixins
|
||||
@import "bootstrap/variables";
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
* General Colors
|
||||
*/
|
||||
$style_color: #474D57;
|
||||
$bg_style_color: #2299BB;
|
||||
$hover: #D9EDF7;
|
||||
|
||||
/*
|
||||
|
@ -40,3 +39,8 @@ $border_warning: #EB9532;
|
|||
*/
|
||||
$added: #63c363;
|
||||
$deleted: #f77;
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
$nprogress-color: #3498db;
|
||||
|
|
|
@ -213,3 +213,27 @@ li.commit {
|
|||
padding: 4px 12px;
|
||||
}
|
||||
}
|
||||
|
||||
.commit-message-container {
|
||||
background-color: $body-bg;
|
||||
position: relative;
|
||||
font-family: $monospace_font;
|
||||
$left: 12px;
|
||||
.max-width-marker {
|
||||
width: 72ch;
|
||||
color: rgba(0, 0, 0, 0.0);
|
||||
font-family: inherit;
|
||||
left: $left;
|
||||
height: 100%;
|
||||
border-right: 1px solid mix($input-border, white);
|
||||
position: absolute;
|
||||
z-index: 1;
|
||||
}
|
||||
> textarea {
|
||||
background-color: rgba(0, 0, 0, 0.0);
|
||||
font-family: inherit;
|
||||
padding-left: $left;
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -6,14 +6,12 @@ header {
|
|||
&.navbar-gitlab {
|
||||
margin-bottom: 0;
|
||||
min-height: 40px;
|
||||
border: none;
|
||||
|
||||
.navbar-inner {
|
||||
background: #F1F1F1;
|
||||
border-bottom: 1px solid #DDD;
|
||||
filter: none;
|
||||
|
||||
.nav > li > a {
|
||||
color: $style_color;
|
||||
font-size: 14px;
|
||||
line-height: 32px;
|
||||
padding: 6px 10px;
|
||||
|
@ -248,8 +246,6 @@ header {
|
|||
float: left;
|
||||
height: 46px;
|
||||
width: 2px;
|
||||
background: white;
|
||||
border-left: 1px solid #DDD;
|
||||
margin-left: 10px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
margin: 20px 0;
|
||||
margin-top: 0;
|
||||
padding-top: 4px;
|
||||
border-bottom: 1px solid #E1E1E1;
|
||||
border-bottom: 1px solid #E9E9E9;
|
||||
|
||||
ul {
|
||||
padding: 0;
|
||||
|
|
|
@ -56,10 +56,10 @@
|
|||
text-align: center;
|
||||
|
||||
.prev {
|
||||
@extend .thumbnail;
|
||||
height: 30px;
|
||||
width: 175px;
|
||||
height: 80px;
|
||||
width: 160px;
|
||||
margin-bottom: 10px;
|
||||
@include border-radius(4px);
|
||||
|
||||
&.classic {
|
||||
background: #31363e;
|
||||
|
@ -92,10 +92,13 @@
|
|||
text-align: center;
|
||||
|
||||
.prev {
|
||||
@extend .thumbnail;
|
||||
height: 151px;
|
||||
width: 220px;
|
||||
width: 160px;
|
||||
margin-bottom: 10px;
|
||||
|
||||
img {
|
||||
max-width: 100%;
|
||||
@include border-radius(4px);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,11 +4,21 @@
|
|||
*
|
||||
*/
|
||||
.ui_basic {
|
||||
header {
|
||||
&.navbar-gitlab {
|
||||
.navbar-inner {
|
||||
background: #F1F1F1;
|
||||
border-bottom: 1px solid #DDD;
|
||||
.nav > li > a {
|
||||
color: $style_color;
|
||||
}
|
||||
.separator {
|
||||
background: #F9F9F9;
|
||||
border-left: 1px solid #DDD;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
.main-nav {
|
||||
background: #FFF;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue