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
Boxiang Sun
gitlab-ce
Commits
88cb02ba
Commit
88cb02ba
authored
Apr 09, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove deprecated mixins
parent
36143d41
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
25 additions
and
9 deletions
+25
-9
app/assets/stylesheets/framework.bs3.scss
app/assets/stylesheets/framework.bs3.scss
+3
-0
app/assets/stylesheets/framework.bs4.scss
app/assets/stylesheets/framework.bs4.scss
+5
-0
app/assets/stylesheets/framework.scss
app/assets/stylesheets/framework.scss
+1
-0
app/assets/stylesheets/pages/commits.scss
app/assets/stylesheets/pages/commits.scss
+1
-1
app/assets/stylesheets/pages/cycle_analytics.scss
app/assets/stylesheets/pages/cycle_analytics.scss
+3
-1
app/assets/stylesheets/pages/diff.scss
app/assets/stylesheets/pages/diff.scss
+3
-3
app/assets/stylesheets/pages/help.scss
app/assets/stylesheets/pages/help.scss
+1
-1
app/assets/stylesheets/pages/profile.scss
app/assets/stylesheets/pages/profile.scss
+1
-1
app/assets/stylesheets/pages/stat_graph.scss
app/assets/stylesheets/pages/stat_graph.scss
+7
-2
No files found.
app/assets/stylesheets/framework.bs3.scss
View file @
88cb02ba
...
@@ -11,3 +11,6 @@ $border-radius-base: 3px !default;
...
@@ -11,3 +11,6 @@ $border-radius-base: 3px !default;
$modal-body-bg
:
$white-light
;
$modal-body-bg
:
$white-light
;
$input-border
:
$border-color
;
$input-border
:
$border-color
;
$input-border-focus
:
$focus-border-color
;
$input-border-focus
:
$focus-border-color
;
$padding-base-vertical
:
$gl-vert-padding
;
$padding-base-horizontal
:
$gl-padding
;
app/assets/stylesheets/framework.bs4.scss
0 → 100644
View file @
88cb02ba
// Override variables from bs4
html
{
font-size
:
14px
;
}
app/assets/stylesheets/framework.scss
View file @
88cb02ba
@import
"framework/variables"
;
@import
"framework/variables"
;
@import
"framework/mixins"
;
@import
"framework/mixins"
;
@import
"framework.bs4"
;
@import
"../../../node_modules/bootstrap/scss/bootstrap"
;
@import
"../../../node_modules/bootstrap/scss/bootstrap"
;
@import
"framework.bs3"
;
@import
"framework.bs3"
;
@import
"framework/layout"
;
@import
"framework/layout"
;
...
...
app/assets/stylesheets/pages/commits.scss
View file @
88cb02ba
...
@@ -317,7 +317,7 @@
...
@@ -317,7 +317,7 @@
}
}
&
.invalid
{
&
.invalid
{
@include
status-color
(
$gray-dark
,
$gray
,
$gray-darkest
);
@include
status-color
(
$gray-dark
,
color
(
"gray"
)
,
$gray-darkest
);
border-color
:
$gray-darkest
;
border-color
:
$gray-darkest
;
}
}
}
}
...
...
app/assets/stylesheets/pages/cycle_analytics.scss
View file @
88cb02ba
...
@@ -266,7 +266,9 @@
...
@@ -266,7 +266,9 @@
&
.issue-title
,
&
.issue-title
,
&
.commit-title
,
&
.commit-title
,
&
.merge-merquest-title
{
&
.merge-merquest-title
{
@include
text-overflow
();
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
max-width
:
100%
;
max-width
:
100%
;
display
:
block
;
display
:
block
;
...
...
app/assets/stylesheets/pages/diff.scss
View file @
88cb02ba
...
@@ -80,13 +80,13 @@
...
@@ -80,13 +80,13 @@
&
.left-side-selected
{
&
.left-side-selected
{
td
.line_content.parallel.right-side
{
td
.line_content.parallel.right-side
{
@include
user-select
(
none
)
;
user-select
:
none
;
}
}
}
}
&
.right-side-selected
{
&
.right-side-selected
{
td
.line_content.parallel.left-side
{
td
.line_content.parallel.left-side
{
@include
user-select
(
none
)
;
user-select
:
none
;
}
}
}
}
}
}
...
@@ -103,7 +103,7 @@
...
@@ -103,7 +103,7 @@
.old_line
,
.old_line
,
.new_line
{
.new_line
{
@include
user-select
(
none
)
;
user-select
:
none
;
margin
:
0
;
margin
:
0
;
border
:
0
;
border
:
0
;
padding
:
0
5px
;
padding
:
0
5px
;
...
...
app/assets/stylesheets/pages/help.scss
View file @
88cb02ba
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
.key
{
.key
{
@extend
.badge.badge-pill
;
@extend
.badge.badge-pill
;
@extend
.badge.badge-pill-inverse
;
background-color
:
$label-inverse-bg
;
font
:
11px
Consolas
,
"Liberation Mono"
,
Menlo
,
Courier
,
monospace
;
font
:
11px
Consolas
,
"Liberation Mono"
,
Menlo
,
Courier
,
monospace
;
padding
:
3px
5px
;
padding
:
3px
5px
;
}
}
...
...
app/assets/stylesheets/pages/profile.scss
View file @
88cb02ba
...
@@ -419,7 +419,7 @@ table.u2f-registrations {
...
@@ -419,7 +419,7 @@ table.u2f-registrations {
}
}
&
.unverified
{
&
.unverified
{
@include
status-color
(
$gray-dark
,
$gray
,
$common-gray-dark
);
@include
status-color
(
$gray-dark
,
color
(
"gray"
)
,
$common-gray-dark
);
}
}
}
}
}
}
app/assets/stylesheets/pages/stat_graph.scss
View file @
88cb02ba
...
@@ -14,7 +14,9 @@
...
@@ -14,7 +14,9 @@
}
}
#contributors-master
{
#contributors-master
{
@include
make-md-column
(
12
);
@include
media-breakpoint-up
(
md
)
{
@include
make-col
(
12
);
}
svg
{
svg
{
width
:
100%
;
width
:
100%
;
...
@@ -33,7 +35,10 @@
...
@@ -33,7 +35,10 @@
}
}
.person
{
.person
{
@include
make-md-column
(
6
);
@include
media-breakpoint-up
(
md
)
{
@include
make-col
(
6
);
}
margin-top
:
10px
;
margin-top
:
10px
;
@include
media-breakpoint-down
(
xs
)
{
@include
media-breakpoint-down
(
xs
)
{
...
...
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