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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
55ab7a2a
Commit
55ab7a2a
authored
Jun 03, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove color-named css classes
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
95d61a09
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
30 deletions
+42
-30
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+0
-5
app/assets/stylesheets/sections/notifications.scss
app/assets/stylesheets/sections/notifications.scss
+22
-0
app/assets/stylesheets/sections/profile.scss
app/assets/stylesheets/sections/profile.scss
+0
-17
app/assets/stylesheets/sections/projects.scss
app/assets/stylesheets/sections/projects.scss
+12
-0
app/helpers/notifications_helper.rb
app/helpers/notifications_helper.rb
+4
-4
app/helpers/visibility_level_helper.rb
app/helpers/visibility_level_helper.rb
+3
-3
app/views/projects/blob/_blob.html.haml
app/views/projects/blob/_blob.html.haml
+1
-1
No files found.
app/assets/stylesheets/generic/common.scss
View file @
55ab7a2a
...
@@ -3,12 +3,7 @@
...
@@ -3,12 +3,7 @@
.clgray
{
color
:
#BBB
}
.clgray
{
color
:
#BBB
}
.cred
{
color
:
#D12F19
}
.cred
{
color
:
#D12F19
}
.cgreen
{
color
:
#4a2
}
.cgreen
{
color
:
#4a2
}
.cblue
{
color
:
#29A
}
.cblack
{
color
:
#111
}
.cdark
{
color
:
#444
}
.cdark
{
color
:
#444
}
.camber
{
color
:
#ffc000
}
.cwhite
{
color
:
#fff
!
important
}
.bgred
{
background
:
#F2DEDE
!
important
}
/** COMMON CLASSES **/
/** COMMON CLASSES **/
.prepend-top-10
{
margin-top
:
10px
}
.prepend-top-10
{
margin-top
:
10px
}
...
...
app/assets/stylesheets/sections/notifications.scss
0 → 100644
View file @
55ab7a2a
.global-notifications-form
.level-title
{
font-size
:
15px
;
color
:
#333
;
font-weight
:
bold
;
}
.notification-icon-holder
{
width
:
20px
;
float
:
left
;
}
.ns-part
{
color
:
$bg_primary
;
}
.ns-watch
{
color
:
$bg_success
;
}
.ns-mute
{
color
:
$bg_danger
;
}
app/assets/stylesheets/sections/profile.scss
View file @
55ab7a2a
.update-notifications
{
.radio-inline
{
margin-right
:
9%
;
}
}
.account-page
{
.account-page
{
fieldset
{
fieldset
{
margin-bottom
:
15px
;
margin-bottom
:
15px
;
...
@@ -114,14 +108,3 @@
...
@@ -114,14 +108,3 @@
height
:
50px
;
height
:
50px
;
}
}
}
}
.global-notifications-form
.level-title
{
font-size
:
15px
;
color
:
#333
;
font-weight
:
bold
;
}
.notification-icon-holder
{
width
:
20px
;
float
:
left
;
}
app/assets/stylesheets/sections/projects.scss
View file @
55ab7a2a
...
@@ -232,3 +232,15 @@ ul.nav.nav-projects-tabs {
...
@@ -232,3 +232,15 @@ ul.nav.nav-projects-tabs {
.deploy-project-label
{
.deploy-project-label
{
margin
:
1px
;
margin
:
1px
;
}
}
.vs-public
{
color
:
$bg_primary
;
}
.vs-internal
{
color
:
$bg_warning
;
}
.vs-private
{
color
:
$bg_success
;
}
app/helpers/notifications_helper.rb
View file @
55ab7a2a
module
NotificationsHelper
module
NotificationsHelper
def
notification_icon
(
notification
)
def
notification_icon
(
notification
)
if
notification
.
disabled?
if
notification
.
disabled?
content_tag
:i
,
nil
,
class:
'icon-volume-off
cred
'
content_tag
:i
,
nil
,
class:
'icon-volume-off
ns-mute
'
elsif
notification
.
participating?
elsif
notification
.
participating?
content_tag
:i
,
nil
,
class:
'icon-volume-down
cblue
'
content_tag
:i
,
nil
,
class:
'icon-volume-down
ns-part
'
elsif
notification
.
watch?
elsif
notification
.
watch?
content_tag
:i
,
nil
,
class:
'icon-volume-up
cgreen
'
content_tag
:i
,
nil
,
class:
'icon-volume-up
ns-watch
'
else
else
content_tag
:i
,
nil
,
class:
'icon-circle-blank
cblue
'
content_tag
:i
,
nil
,
class:
'icon-circle-blank
ns-default
'
end
end
end
end
end
end
app/helpers/visibility_level_helper.rb
View file @
55ab7a2a
...
@@ -2,11 +2,11 @@ module VisibilityLevelHelper
...
@@ -2,11 +2,11 @@ module VisibilityLevelHelper
def
visibility_level_color
(
level
)
def
visibility_level_color
(
level
)
case
level
case
level
when
Gitlab
::
VisibilityLevel
::
PRIVATE
when
Gitlab
::
VisibilityLevel
::
PRIVATE
'
cgreen
'
'
vs-private
'
when
Gitlab
::
VisibilityLevel
::
INTERNAL
when
Gitlab
::
VisibilityLevel
::
INTERNAL
'
camber
'
'
vs-internal
'
when
Gitlab
::
VisibilityLevel
::
PUBLIC
when
Gitlab
::
VisibilityLevel
::
PUBLIC
'
cblue
'
'
vs-public
'
end
end
end
end
...
...
app/views/projects/blob/_blob.html.haml
View file @
55ab7a2a
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
-
if
path
-
if
path
-
if
path
.
end_with?
(
@path
)
-
if
path
.
end_with?
(
@path
)
=
link_to
project_blob_path
(
@project
,
path
)
do
=
link_to
project_blob_path
(
@project
,
path
)
do
%s
pan
.cblue
%s
trong
=
truncate
(
title
,
length:
40
)
=
truncate
(
title
,
length:
40
)
-
else
-
else
=
link_to
truncate
(
title
,
length:
40
),
project_tree_path
(
@project
,
path
)
=
link_to
truncate
(
title
,
length:
40
),
project_tree_path
(
@project
,
path
)
...
...
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