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
433b4c76
Commit
433b4c76
authored
Mar 07, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply some styles from flatly theme
parent
887cf5c7
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
37 additions
and
45 deletions
+37
-45
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+1
-1
app/assets/stylesheets/gl_variables.scss
app/assets/stylesheets/gl_variables.scss
+25
-24
app/assets/stylesheets/main/variables.scss
app/assets/stylesheets/main/variables.scss
+5
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+0
-14
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+2
-2
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-1
app/views/shared/_no_ssh.html.haml
app/views/shared/_no_ssh.html.haml
+3
-3
No files found.
app/assets/stylesheets/application.scss
View file @
433b4c76
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
* Page specific styles (issues, projects etc):
* Page specific styles (issues, projects etc):
*/
*/
@import
"
section
s/*"
;
@import
"
page
s/*"
;
/**
/**
* Code highlight
* Code highlight
...
...
app/assets/stylesheets/gl_variables.scss
View file @
433b4c76
...
@@ -444,21 +444,21 @@ $font-size-base: $gl-font-size;
...
@@ -444,21 +444,21 @@ $font-size-base: $gl-font-size;
//
//
//##
//##
// $pagination-color: $link-color
$pagination-color
:
#fff
;
// $pagination-bg: #fff
$pagination-bg
:
$brand-success
;
// $pagination-border: #ddd
$pagination-border
:
transparent
;
// $pagination-hover-color: $link-hover-color
$pagination-hover-color
:
#fff
;
// $pagination-hover-bg: $gray-lighter
$pagination-hover-bg
:
darken
(
$brand-success
,
15%
);
// $pagination-hover-border: #ddd
$pagination-hover-border
:
transparent
;
// $pagination-active-color: #fff
$pagination-active-color
:
#fff
;
// $pagination-active-bg: $brand-primary
$pagination-active-bg
:
darken
(
$brand-success
,
15%
);
// $pagination-active-border: $brand-primary
$pagination-active-border
:
transparent
;
// $pagination-disabled-color: $gray-light
$pagination-disabled-color
:
#b4bcc2
;
// $pagination-disabled-bg: #fff
$pagination-disabled-bg
:
lighten
(
$brand-success
,
15%
);
// $pagination-disabled-border: #ddd
$pagination-disabled-border
:
transparent
;
//== Pager
//== Pager
...
@@ -492,21 +492,22 @@ $font-size-base: $gl-font-size;
...
@@ -492,21 +492,22 @@ $font-size-base: $gl-font-size;
//
//
//## Define colors for form feedback states and, by default, alerts.
//## Define colors for form feedback states and, by default, alerts.
// $state-success-text: #3c763d
// $state-success-bg: #dff0d8
// $state-success-border: darken(adjust-hue($state-success-bg, -10), 5%)
// $state-info-text: #31708f
$state-success-text
:
#fff
;
// $state-info-bg: #d9edf7
$state-success-bg
:
$brand-success
;
// $state-info-border: darken(adjust-hue($state-info-bg, -10), 7%)
$state-success-border
:
$brand-success
;
// $state-warning-text: #8a6d3b
$state-info-text
:
#fff
;
// $state-warning-bg: #fcf8e3
$state-info-bg
:
$brand-info
;
// $state-warning-border: darken(adjust-hue($state-warning-bg, -10), 5%)
$state-info-border
:
$brand-info
;
// $state-danger-text: #a94442
$state-warning-text
:
#fff
;
// $state-danger-bg: #f2dede
$state-warning-bg
:
$brand-warning
;
// $state-danger-border: darken(adjust-hue($state-danger-bg, -10), 5%)
$state-warning-border
:
$brand-warning
;
$state-danger-text
:
#fff
;
$state-danger-bg
:
$brand-danger
;
$state-danger-border
:
$brand-danger
;
//== Tooltips
//== Tooltips
...
...
app/assets/stylesheets/main/variables.scss
View file @
433b4c76
...
@@ -19,6 +19,11 @@ $gl-primary: #446e9b;
...
@@ -19,6 +19,11 @@ $gl-primary: #446e9b;
$gl-info
:
#029ACF
;
$gl-info
:
#029ACF
;
$gl-warning
:
#EB9532
;
$gl-warning
:
#EB9532
;
$gl-primary
:
#2C3E50
;
$gl-success
:
#18BC9C
;
$gl-info
:
#3498DB
;
$gl-warning
:
#F39C12
;
$gl-danger
:
#E74C3C
;
/*
/*
* Commit Diff Colors
* Commit Diff Colors
*/
*/
...
...
app/assets/stylesheets/pages/projects.scss
View file @
433b4c76
...
@@ -101,23 +101,9 @@
...
@@ -101,23 +101,9 @@
.btn
,
.btn
,
.form-control
{
.form-control
{
border
:
1px
solid
#E1E1E1
;
box-shadow
:
none
;
padding
:
6px
9px
;
padding
:
6px
9px
;
}
}
.btn
{
background
:
none
;
color
:
$gl-link-color
;
&
.active
{
background-color
:
#f5f5f5
;
border
:
1px
solid
rgba
(
0
,
0
,
0
,
0
.195
);
color
:
#333
;
font-weight
:
bold
;
}
}
.form-control
{
.form-control
{
cursor
:
auto
;
cursor
:
auto
;
@extend
.monospace
;
@extend
.monospace
;
...
...
app/views/projects/new.html.haml
View file @
433b4c76
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
%span
Import existing git repo
%span
Import existing git repo
.col-sm-10
.col-sm-10
=
f
.
text_field
:import_url
,
class:
'form-control'
,
placeholder:
'https://github.com/randx/six.git'
=
f
.
text_field
:import_url
,
class:
'form-control'
,
placeholder:
'https://github.com/randx/six.git'
.alert.alert-info
.alert.alert-info
.prepend-top-10
This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
This URL must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
%br
%br
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
The import will time out after 4 minutes. For big repositories, use a clone/push combination.
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
%i
.fa.fa-bitbucket
%i
.fa.fa-bitbucket
Import projects from Bitbucket
Import projects from Bitbucket
=
render
'bitbucket_import_modal'
=
render
'bitbucket_import_modal'
-
unless
request
.
host
==
'gitlab.com'
-
unless
request
.
host
==
'gitlab.com'
.project-import.form-group
.project-import.form-group
.col-sm-2
.col-sm-2
...
...
app/views/projects/show.html.haml
View file @
433b4c76
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
%p
Repository is read-only
%p
Repository is read-only
-
if
@project
.
forked_from_project
-
if
@project
.
forked_from_project
.
alert.alert-success
.
well
%i
.fa.fa-code-fork.project-fork-icon
%i
.fa.fa-code-fork.project-fork-icon
Forked from:
Forked from:
%br
%br
...
...
app/views/shared/_no_ssh.html.haml
View file @
433b4c76
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
!
current_user
.
hide_no_ssh_key
&&
current_user
.
require_ssh_key?
-
if
cookies
[
:hide_no_ssh_message
].
blank?
&&
!
current_user
.
hide_no_ssh_key
&&
current_user
.
require_ssh_key?
.no-ssh-key-message.alert.alert-warning.hidden-xs
.no-ssh-key-message.alert.alert-warning.hidden-xs
You won't be able to pull or push project code via SSH until you
#{
link_to
'add an SSH key'
,
new_profile_key_path
}
to your profile
You won't be able to pull or push project code via SSH until you
#{
link_to
'add an SSH key'
,
new_profile_key_path
,
class:
'alert-link'
}
to your profile
.pull-right
.pull-right
=
link_to
"Don't show again"
,
profile_path
(
user:
{
hide_no_ssh_key:
true
}),
method: :put
=
link_to
"Don't show again"
,
profile_path
(
user:
{
hide_no_ssh_key:
true
}),
method: :put
,
class:
'alert-link'
|
|
=
link_to
'Remind later'
,
'#'
,
class:
'hide-no-ssh-message'
=
link_to
'Remind later'
,
'#'
,
class:
'hide-no-ssh-message
alert-link
'
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