BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5ba1055d
Commit
5ba1055d
authored
Jan 03, 2017
by
dimitrieh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added additional hover animations, fixed up avatars
parent
6bd785a5
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
61 additions
and
6 deletions
+61
-6
animations.scss
app/assets/stylesheets/framework/animations.scss
+20
-2
avatar.scss
app/assets/stylesheets/framework/avatar.scss
+4
-0
header.scss
app/assets/stylesheets/framework/header.scss
+3
-1
variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+4
-0
issuable.scss
app/assets/stylesheets/pages/issuable.scss
+4
-0
profile.scss
app/assets/stylesheets/pages/profile.scss
+9
-2
search.scss
app/assets/stylesheets/pages/search.scss
+14
-0
show.html.haml
app/views/profiles/show.html.haml
+2
-1
No files found.
app/assets/stylesheets/framework/animations.scss
View file @
5ba1055d
...
@@ -94,10 +94,23 @@
...
@@ -94,10 +94,23 @@
@return
$unfoldedTransition
;
@return
$unfoldedTransition
;
}
}
.btn
{
.btn
,
.side-nav-toggle
{
@include
transition
(
background-color
,
border-color
,
color
,
box-shadow
);
@include
transition
(
background-color
,
border-color
,
color
,
box-shadow
);
}
}
.dropdown-menu-toggle
,
.avatar-circle
{
@include
transition
(
border-color
);
}
.note-action-button
.link-highlight
,
.toolbar-btn
,
.dropdown-toggle-caret
,
.fa
{
@include
transition
(
color
);
}
a
{
a
{
@include
transition
(
background-color
,
color
,
border
);
@include
transition
(
background-color
,
color
,
border
);
}
}
...
@@ -106,6 +119,11 @@ a {
...
@@ -106,6 +119,11 @@ a {
@include
transition
(
box-shadow
);
@include
transition
(
box-shadow
);
}
}
.tree-table
td
{
.tree-table
td
,
.well-list
>
li
{
@include
transition
(
background-color
,
border-color
);
@include
transition
(
background-color
,
border-color
);
}
}
.stage-nav-item
{
@include
transition
(
background-color
,
box-shadow
);
}
app/assets/stylesheets/framework/avatar.scss
View file @
5ba1055d
...
@@ -24,6 +24,10 @@
...
@@ -24,6 +24,10 @@
&
.s110
{
@include
avatar-size
(
110px
,
15px
);
}
&
.s110
{
@include
avatar-size
(
110px
,
15px
);
}
&
.s140
{
@include
avatar-size
(
140px
,
15px
);
}
&
.s140
{
@include
avatar-size
(
140px
,
15px
);
}
&
.s160
{
@include
avatar-size
(
160px
,
20px
);
}
&
.s160
{
@include
avatar-size
(
160px
,
20px
);
}
&
:hover
{
border-color
:
$gl-link-color
;
}
}
}
.avatar
{
.avatar
{
...
...
app/assets/stylesheets/framework/header.scss
View file @
5ba1055d
...
@@ -104,6 +104,7 @@ header {
...
@@ -104,6 +104,7 @@ header {
&
:hover
{
&
:hover
{
background-color
:
$white-normal
;
background-color
:
$white-normal
;
color
:
$gl-header-nav-hover-color
;
}
}
}
}
}
}
...
@@ -180,6 +181,7 @@ header {
...
@@ -180,6 +181,7 @@ header {
&
:hover
{
&
:hover
{
text-decoration
:
underline
;
text-decoration
:
underline
;
color
:
$gl-header-nav-hover-color
;
}
}
}
}
...
@@ -198,7 +200,7 @@ header {
...
@@ -198,7 +200,7 @@ header {
cursor
:
pointer
;
cursor
:
pointer
;
&
:hover
{
&
:hover
{
color
:
darken
(
$color
:
$gl-text-color
,
$amount
:
30%
)
;
color
:
$gl-header-nav-hover-color
;
}
}
}
}
...
...
app/assets/stylesheets/framework/variables.scss
View file @
5ba1055d
...
@@ -109,6 +109,7 @@ $gl-grayish-blue: #7f8fa4;
...
@@ -109,6 +109,7 @@ $gl-grayish-blue: #7f8fa4;
$gl-gray
:
$gl-text-color
;
$gl-gray
:
$gl-text-color
;
$gl-gray-dark
:
#313236
;
$gl-gray-dark
:
#313236
;
$gl-header-color
:
#4c4e54
;
$gl-header-color
:
#4c4e54
;
$gl-header-nav-hover-color
:
#434343
;
/*
/*
* Lists
* Lists
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
5ba1055d
...
@@ -20,6 +20,10 @@
...
@@ -20,6 +20,10 @@
.fa
{
.fa
{
color
:
$cycle-analytics-light-gray
;
color
:
$cycle-analytics-light-gray
;
&
:hover
{
color
:
$gl-text-color
;
}
}
}
.stage-header
{
.stage-header
{
...
...
app/assets/stylesheets/pages/issuable.scss
View file @
5ba1055d
...
@@ -277,6 +277,10 @@
...
@@ -277,6 +277,10 @@
&
:hover
{
&
:hover
{
color
:
$md-link-color
;
color
:
$md-link-color
;
text-decoration
:
none
;
text-decoration
:
none
;
.avatar
{
border-color
:
$md-link-color
;
}
}
}
}
}
...
...
app/assets/stylesheets/pages/profile.scss
View file @
5ba1055d
...
@@ -222,6 +222,10 @@
...
@@ -222,6 +222,10 @@
margin-left
:
5px
;
margin-left
:
5px
;
}
}
.nav-links
li
{
margin-right
:
-4px
;
}
.profile-header
{
.profile-header
{
margin
:
0
auto
;
margin
:
0
auto
;
...
@@ -253,6 +257,10 @@
...
@@ -253,6 +257,10 @@
}
}
}
}
}
}
.nav-links
li
{
margin-right
:
-7px
;
}
}
}
}
}
...
@@ -271,4 +279,4 @@ table.u2f-registrations {
...
@@ -271,4 +279,4 @@ table.u2f-registrations {
.scopes-list
{
.scopes-list
{
padding-left
:
18px
;
padding-left
:
18px
;
}
}
}
}
\ No newline at end of file
app/assets/stylesheets/pages/search.scss
View file @
5ba1055d
...
@@ -14,6 +14,20 @@
...
@@ -14,6 +14,20 @@
}
}
}
}
.search
form
:hover
,
.file-finder-input
:hover
,
.issuable-search-form
:hover
,
.search-text-input
:hover
,
textarea
:hover
,
.form-control
:hover
{
border-color
:
lighten
(
$dropdown-input-focus-border
,
20%
);
box-shadow
:
0
0
4px
lighten
(
$search-input-focus-shadow-color
,
20%
);
}
input
[
type
=
"checkbox"
]
:hover
{
box-shadow
:
0
0
2px
2px
rgba
(
153
,
212
,
247
,
0
.4
)
,
0
0
0
1px
rgba
(
153
,
212
,
247
,
0
.4
);
}
.search
{
.search
{
margin-right
:
10px
;
margin-right
:
10px
;
margin-left
:
10px
;
margin-left
:
10px
;
...
...
app/views/profiles/show.html.haml
View file @
5ba1055d
...
@@ -18,7 +18,8 @@
...
@@ -18,7 +18,8 @@
or change it at
#{
link_to
Gitlab
.
config
.
gravatar
.
host
,
"http://"
+
Gitlab
.
config
.
gravatar
.
host
}
or change it at
#{
link_to
Gitlab
.
config
.
gravatar
.
host
,
"http://"
+
Gitlab
.
config
.
gravatar
.
host
}
.col-lg-9
.col-lg-9
.clearfix.avatar-image.append-bottom-default
.clearfix.avatar-image.append-bottom-default
=
image_tag
avatar_icon
(
@user
,
160
),
alt:
''
,
class:
'avatar s160'
=
link_to
avatar_icon
(
@user
,
400
),
target:
'_blank'
do
=
image_tag
avatar_icon
(
@user
,
160
),
alt:
''
,
class:
'avatar s160'
%h5
.prepend-top-0
%h5
.prepend-top-0
Upload new avatar
Upload new avatar
.prepend-top-5.append-bottom-10
.prepend-top-5.append-bottom-10
...
...
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