Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
6b76ffc2
Commit
6b76ffc2
authored
Mar 09, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply more styles from Flatly theme
Also add bottom margin for footer links on login page
parent
b51e2a05
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
31 additions
and
23 deletions
+31
-23
app/assets/stylesheets/base/gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+21
-15
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+6
-3
app/assets/stylesheets/generic/forms.scss
app/assets/stylesheets/generic/forms.scss
+1
-1
app/assets/stylesheets/pages/events.scss
app/assets/stylesheets/pages/events.scss
+1
-2
app/assets/stylesheets/pages/tree.scss
app/assets/stylesheets/pages/tree.scss
+1
-1
app/views/layouts/_public_head_panel.html.haml
app/views/layouts/_public_head_panel.html.haml
+1
-1
No files found.
app/assets/stylesheets/base/gl_variables.scss
View file @
6b76ffc2
...
@@ -15,6 +15,12 @@
...
@@ -15,6 +15,12 @@
// $gray: lighten($gray-base, 33.5%) // #555
// $gray: lighten($gray-base, 33.5%) // #555
// $gray-light: lighten($gray-base, 46.7%) // #777
// $gray-light: lighten($gray-base, 46.7%) // #777
// $gray-lighter: lighten($gray-base, 93.5%) // #eee
// $gray-lighter: lighten($gray-base, 93.5%) // #eee
$gray-base
:
#000
;
$gray-darker
:
lighten
(
$gray-base
,
13
.5%
);
// #222
$gray-dark
:
#7b8a8b
;
// #333
$gray
:
#95a5a6
;
// #555
$gray-light
:
#b4bcc2
;
// #999
$gray-lighter
:
#ecf0f1
;
// #eee
$brand-primary
:
$gl-primary
;
$brand-primary
:
$gl-primary
;
$brand-success
:
$gl-success
;
$brand-success
:
$gl-success
;
...
@@ -30,7 +36,7 @@ $brand-danger: $gl-danger;
...
@@ -30,7 +36,7 @@ $brand-danger: $gl-danger;
//** Background color for `<body>`.
//** Background color for `<body>`.
// $body-bg: #fff
// $body-bg: #fff
//** Global text color on `<body>`.
//** Global text color on `<body>`.
// $text-color: $gray-dark
$text-color
:
$brand-primary
;
//** Global textual link color.
//** Global textual link color.
$link-color
:
$gl-link-color
;
$link-color
:
$gl-link-color
;
...
@@ -187,9 +193,9 @@ $padding-base-horizontal: 14px;
...
@@ -187,9 +193,9 @@ $padding-base-horizontal: 14px;
// $input-bg-disabled: $gray-lighter
// $input-bg-disabled: $gray-lighter
//** Text color for `<input>`s
//** Text color for `<input>`s
// $input-color: $gray
$input-color
:
$text-color
;
//** `<input>` border color
//** `<input>` border color
// $input-border: #ccc
$input-border
:
#dce4ec
;
// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
//** Default `.form-control` border radius
//** Default `.form-control` border radius
...
@@ -201,7 +207,7 @@ $padding-base-horizontal: 14px;
...
@@ -201,7 +207,7 @@ $padding-base-horizontal: 14px;
// $input-border-radius-small: $border-radius-small
// $input-border-radius-small: $border-radius-small
//** Border color for inputs on focus
//** Border color for inputs on focus
// $input-border-focus: #66afe9
$input-border-focus
:
$brand-info
;
//** Placeholder text color
//** Placeholder text color
// $input-color-placeholder: #999
// $input-color-placeholder: #999
...
@@ -213,7 +219,7 @@ $padding-base-horizontal: 14px;
...
@@ -213,7 +219,7 @@ $padding-base-horizontal: 14px;
//** Small `.form-control` height
//** Small `.form-control` height
// $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2)
// $input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2)
// $legend-color: $gray-dark
$legend-color
:
$text-color
;
// $legend-border-color: #e5e5e5
// $legend-border-color: #e5e5e5
//** Background color for textual input addons
//** Background color for textual input addons
...
@@ -709,7 +715,7 @@ $panel-border-radius: 0;
...
@@ -709,7 +715,7 @@ $panel-border-radius: 0;
// $panel-inner-border: #ddd
// $panel-inner-border: #ddd
// $panel-footer-bg: #f5f5f5
// $panel-footer-bg: #f5f5f5
// $panel-default-text: $gray-dark
$panel-default-text
:
$text-color
;
// $panel-default-border: #ddd
// $panel-default-border: #ddd
// $panel-default-heading-bg: #f5f5f5
// $panel-default-heading-bg: #f5f5f5
...
@@ -757,8 +763,8 @@ $panel-border-radius: 0;
...
@@ -757,8 +763,8 @@ $panel-border-radius: 0;
//
//
//##
//##
// $well-bg: #f5f5f5
$well-bg
:
$gray-lighter
;
// $well-border: darken($well-bg, 7%)
$well-border
:
transparent
;
//== Badges
//== Badges
...
@@ -826,15 +832,15 @@ $panel-border-radius: 0;
...
@@ -826,15 +832,15 @@ $panel-border-radius: 0;
//
//
//##
//##
// $code-color: #c7254e
$code-color
:
#c7254e
;
// $code-bg: #f9f2f4
$code-bg
:
#f9f2f4
;
// $kbd-color: #fff
$kbd-color
:
#fff
;
// $kbd-bg: #333
$kbd-bg
:
#333
;
// $pre-bg: #f5f5f5
$pre-bg
:
$gray-lighter
;
// $pre-color: $gray-dark
$pre-color
:
$gray-dark
;
// $pre-border-color: #ccc
$pre-border-color
:
#ccc
;
// $pre-scrollable-max-height: 340px
// $pre-scrollable-max-height: 340px
...
...
app/assets/stylesheets/generic/common.scss
View file @
6b76ffc2
...
@@ -319,7 +319,7 @@ table {
...
@@ -319,7 +319,7 @@ table {
}
}
.btn-sign-in
{
.btn-sign-in
{
margin-top
:
7
px
;
margin-top
:
5
px
;
text-shadow
:
none
;
text-shadow
:
none
;
}
}
...
@@ -337,8 +337,11 @@ table {
...
@@ -337,8 +337,11 @@ table {
overflow-x
:
auto
;
overflow-x
:
auto
;
}
}
.footer-links
a
{
.footer-links
{
margin-bottom
:
20px
;
a
{
margin-right
:
15px
;
margin-right
:
15px
;
}
}
}
.search_box
{
.search_box
{
...
...
app/assets/stylesheets/generic/forms.scss
View file @
6b76ffc2
...
@@ -29,7 +29,7 @@ fieldset legend {
...
@@ -29,7 +29,7 @@ fieldset legend {
padding
:
17px
20px
18px
;
padding
:
17px
20px
18px
;
margin-top
:
18px
;
margin-top
:
18px
;
margin-bottom
:
18px
;
margin-bottom
:
18px
;
background-color
:
whitesmoke
;
background-color
:
#ecf0f1
;
border-top
:
1px
solid
#e5e5e5
;
border-top
:
1px
solid
#e5e5e5
;
}
}
...
...
app/assets/stylesheets/pages/events.scss
View file @
6b76ffc2
...
@@ -46,7 +46,6 @@
...
@@ -46,7 +46,6 @@
border-bottom
:
1px
solid
#eee
;
border-bottom
:
1px
solid
#eee
;
.event-title
{
.event-title
{
@include
str-truncated
(
72%
);
@include
str-truncated
(
72%
);
color
:
#333
;
font-weight
:
500
;
font-weight
:
500
;
font-size
:
14px
;
font-size
:
14px
;
.author_name
{
.author_name
{
...
...
app/assets/stylesheets/pages/tree.scss
View file @
6b76ffc2
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
vertical-align
:
middle
;
vertical-align
:
middle
;
i
{
i
{
color
:
$gl-
primary
;
color
:
$gl-
info
;
}
}
img
{
img
{
...
...
app/views/layouts/_public_head_panel.html.haml
View file @
6b76ffc2
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
-
unless
current_controller?
(
'sessions'
)
-
unless
current_controller?
(
'sessions'
)
.pull-right.hidden-xs
.pull-right.hidden-xs
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-new'
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-new
append-right-10
'
.navbar-collapse.collapse
.navbar-collapse.collapse
%ul
.nav.navbar-nav
%ul
.nav.navbar-nav
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment