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
Tatuya Kamada
gitlab-ce
Commits
aeeb31d6
Commit
aeeb31d6
authored
Sep 03, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change some base colors in UI
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
6d651a02
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
30 additions
and
25 deletions
+30
-25
app/assets/stylesheets/base/gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+2
-2
app/assets/stylesheets/base/mixins.scss
app/assets/stylesheets/base/mixins.scss
+6
-0
app/assets/stylesheets/base/variables.scss
app/assets/stylesheets/base/variables.scss
+5
-4
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+1
-1
app/assets/stylesheets/generic/lists.scss
app/assets/stylesheets/generic/lists.scss
+0
-11
app/assets/stylesheets/generic/typography.scss
app/assets/stylesheets/generic/typography.scss
+5
-0
app/assets/stylesheets/pages/dashboard.scss
app/assets/stylesheets/pages/dashboard.scss
+1
-1
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+1
-1
app/assets/stylesheets/themes/gitlab-theme.scss
app/assets/stylesheets/themes/gitlab-theme.scss
+4
-0
app/views/groups/_projects.html.haml
app/views/groups/_projects.html.haml
+1
-1
app/views/shared/_clone_panel.html.haml
app/views/shared/_clone_panel.html.haml
+3
-3
No files found.
app/assets/stylesheets/base/gl_variables.scss
View file @
aeeb31d6
...
...
@@ -112,8 +112,8 @@ $alert-border-radius: 0;
$panel-border-radius
:
0
;
$panel-default-text
:
$text-color
;
$panel-default-border
:
$border-color
;
$panel-default-heading-bg
:
$background-color
;
$panel-default-border
:
#E7E9ED
;
$panel-default-heading-bg
:
#F8FAFC
;
//== Wells
...
...
app/assets/stylesheets/base/mixins.scss
View file @
aeeb31d6
...
...
@@ -55,6 +55,12 @@
}
@mixin
md-typography
{
color
:
#444
;
a
{
color
:
#3084bb
;
}
img
{
max-width
:
100%
;
}
...
...
app/assets/stylesheets/base/variables.scss
View file @
aeeb31d6
$style_color
:
#474D57
;
$hover
:
#FFFAF1
;
$gl-text-color
:
#222222
;
$gl-link-color
:
#4c4e54
;
$gl-text-color
:
#7f8fa4
;
$gl-header-color
:
#4c4e54
;
$gl-link-color
:
#333c48
;
$nprogress-color
:
#c0392b
;
$gl-font-size
:
16px
;
$list-font-size
:
16px
;
...
...
@@ -10,8 +11,8 @@ $sidebar_width: 230px;
$avatar_radius
:
50%
;
$code_font_size
:
13px
;
$code_line_height
:
1
.5
;
$border-color
:
#E
5E5E5
;
$background-color
:
#
f5f5f5
;
$border-color
:
#E
7E9ED
;
$background-color
:
#
F8FAFC
;
$header-height
:
73px
;
$fixed-layout-width
:
1200px
;
$gl-gray
:
#7f8fa4
;
...
...
app/assets/stylesheets/generic/common.scss
View file @
aeeb31d6
...
...
@@ -23,7 +23,7 @@
.light
{
color
:
$gl-gray
;
}
.slead
{
color
:
#666
;
color
:
$gl-gray
;
font-size
:
15px
;
margin-bottom
:
12px
;
font-weight
:
normal
;
...
...
app/assets/stylesheets/generic/lists.scss
View file @
aeeb31d6
...
...
@@ -49,8 +49,6 @@
}
}
.author
{
color
:
#999
;
}
.list-item-name
{
float
:
left
;
position
:
relative
;
...
...
@@ -71,15 +69,6 @@
font-size
:
$list-font-size
;
line-height
:
18px
;
}
.row_title
{
color
:
$gray-dark
;
&
:hover
{
color
:
$text-color
;
text-decoration
:
underline
;
}
}
}
}
...
...
app/assets/stylesheets/generic/typography.scss
View file @
aeeb31d6
...
...
@@ -9,6 +9,11 @@
margin-bottom
:
5px
;
}
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
color
:
$gl-header-color
;
font-weight
:
500
;
}
/** CODE **/
pre
{
font-family
:
$monospace_font
;
...
...
app/assets/stylesheets/pages/dashboard.scss
View file @
aeeb31d6
...
...
@@ -2,7 +2,7 @@
.side
{
.panel
{
.panel-heading
{
background
:
#EEE
;
background
:
$background-color
;
border-top-left-radius
:
0
;
}
border-top-left-radius
:
0
;
...
...
app/assets/stylesheets/pages/issues.scss
View file @
aeeb31d6
...
...
@@ -10,7 +10,7 @@
}
.issue-info
{
color
:
#999
;
color
:
$gl-gray
;
font-size
:
13px
;
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
aeeb31d6
...
...
@@ -136,7 +136,7 @@
}
.merge-request-info
{
color
:
#999
;
color
:
$gl-gray
;
font-size
:
13px
;
}
...
...
app/assets/stylesheets/themes/gitlab-theme.scss
View file @
aeeb31d6
...
...
@@ -14,6 +14,10 @@
a
{
color
:
$color-light
;
h3
{
color
:
$color-light
;
}
}
&
:hover
{
...
...
app/views/groups/_projects.html.haml
View file @
aeeb31d6
...
...
@@ -7,4 +7,4 @@
=
link_to
new_project_path
(
namespace_id:
@group
.
id
),
class:
'btn btn-success'
do
New project
=
render
'shared/projects/list'
,
projects:
@projects
,
projects_limit:
20
=
render
'shared/projects/list'
,
projects:
@projects
,
projects_limit:
20
,
stars:
false
app/views/shared/_clone_panel.html.haml
View file @
aeeb31d6
...
...
@@ -4,7 +4,7 @@
.input-group-btn
%button
{
|
type:
'button'
,
|
class:
"btn
btn-sm
#{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }"
,
|
class:
"btn #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }"
,
|
:"data-clone"
=>
project
.
ssh_url_to_repo
,
|
:"data-title"
=>
"Add an SSH key to your profile<br> to pull or push via SSH"
,
:"data-html"
=>
"true"
,
...
...
@@ -13,13 +13,13 @@
.input-group-btn
%button
{
|
type:
'button'
,
|
class:
"btn
btn-sm
#{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }"
,
|
class:
"btn #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }"
,
|
:"data-clone"
=>
project
.
http_url_to_repo
,
|
:"data-title"
=>
"Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}"
,
:"data-html"
=>
"true"
,
:"data-container"
=>
"body"
}
=
gitlab_config
.
protocol
.
upcase
=
text_field_tag
:project_clone
,
default_url_to_repo
(
project
),
class:
"js-select-on-focus form-control
input-sm
"
,
readonly:
true
=
text_field_tag
:project_clone
,
default_url_to_repo
(
project
),
class:
"js-select-on-focus form-control"
,
readonly:
true
-
if
project
.
kind_of?
(
Project
)
.input-group-addon
.visibility-level-label.has_tooltip
{
'data-title'
=>
"#{visibility_level_label(project.visibility_level)} project"
}
...
...
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