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
db18593b
Commit
db18593b
authored
Jun 12, 2018
by
Jose
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the btn-xs class from the stylesheets
parent
c102f956
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
5 additions
and
23 deletions
+5
-23
app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
...rge_request_widget/components/states/work_in_progress.vue
+1
-1
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+0
-8
app/assets/stylesheets/framework/markdown_area.scss
app/assets/stylesheets/framework/markdown_area.scss
+0
-4
app/assets/stylesheets/framework/secondary_navigation_elements.scss
.../stylesheets/framework/secondary_navigation_elements.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
app/assets/stylesheets/pages/groups.scss
app/assets/stylesheets/pages/groups.scss
+1
-1
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+0
-6
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+1
-1
No files found.
app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
View file @
db18593b
...
@@ -62,7 +62,7 @@ export default {
...
@@ -62,7 +62,7 @@ export default {
v-if=
"mr.removeWIPPath"
v-if=
"mr.removeWIPPath"
:disabled=
"isMakingRequest"
:disabled=
"isMakingRequest"
type=
"button"
type=
"button"
class=
"btn btn-default btn-
xs
js-remove-wip"
class=
"btn btn-default btn-
sm
js-remove-wip"
@
click=
"removeWIP"
>
@
click=
"removeWIP"
>
<i
<i
v-if=
"isMakingRequest"
v-if=
"isMakingRequest"
...
...
app/assets/stylesheets/framework/buttons.scss
View file @
db18593b
...
@@ -121,10 +121,6 @@
...
@@ -121,10 +121,6 @@
&
.btn-sm
{
&
.btn-sm
{
margin-left
:
$btn-sm-side-margin
;
margin-left
:
$btn-sm-side-margin
;
}
}
&
.btn-xs
{
margin-left
:
$btn-xs-side-margin
;
}
}
}
@mixin
btn-svg
{
@mixin
btn-svg
{
...
@@ -150,10 +146,6 @@
...
@@ -150,10 +146,6 @@
line-height
:
18px
;
line-height
:
18px
;
}
}
&
.btn-xs
{
padding
:
2px
5px
;
}
&
.btn-success
,
&
.btn-success
,
&
.btn-new
,
&
.btn-new
,
&
.btn-create
,
&
.btn-create
,
...
...
app/assets/stylesheets/framework/markdown_area.scss
View file @
db18593b
...
@@ -61,10 +61,6 @@
...
@@ -61,10 +61,6 @@
padding-top
:
0
;
padding-top
:
0
;
line-height
:
19px
;
line-height
:
19px
;
&
.btn.btn-xs
{
padding
:
2px
5px
;
}
&
:focus
{
&
:focus
{
margin-top
:
-10px
;
margin-top
:
-10px
;
padding-top
:
10px
;
padding-top
:
10px
;
...
...
app/assets/stylesheets/framework/secondary_navigation_elements.scss
View file @
db18593b
...
@@ -197,7 +197,7 @@
...
@@ -197,7 +197,7 @@
flex-flow
:
row
wrap
;
flex-flow
:
row
wrap
;
.nav-controls
{
.nav-controls
{
$controls-margin
:
$btn-
xs-side-margin
-
2px
;
$controls-margin
:
$btn-
margin-5
-
2px
;
flex
:
0
0
100%
;
flex
:
0
0
100%
;
&
.controls-flex
{
&
.controls-flex
{
...
...
app/assets/stylesheets/framework/variables.scss
View file @
db18593b
...
@@ -278,7 +278,7 @@ $active-item-blue: $blue-500;
...
@@ -278,7 +278,7 @@ $active-item-blue: $blue-500;
$layout-link-gray
:
#7e7c7c
;
$layout-link-gray
:
#7e7c7c
;
$btn-side-margin
:
10px
;
$btn-side-margin
:
10px
;
$btn-sm-side-margin
:
7px
;
$btn-sm-side-margin
:
7px
;
$btn-
xs-side-margin
:
5px
;
$btn-
margin-5
:
5px
;
$issue-status-expired
:
$orange-500
;
$issue-status-expired
:
$orange-500
;
$issuable-sidebar-color
:
$gl-text-color-secondary
;
$issuable-sidebar-color
:
$gl-text-color-secondary
;
$sidebar-block-hover-color
:
#ebebeb
;
$sidebar-block-hover-color
:
#ebebeb
;
...
...
app/assets/stylesheets/pages/groups.scss
View file @
db18593b
...
@@ -425,7 +425,7 @@
...
@@ -425,7 +425,7 @@
margin-left
:
5px
;
margin-left
:
5px
;
>
.btn
{
>
.btn
{
margin-right
:
$btn-
xs-side-margin
;
margin-right
:
$btn-
margin-5
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
db18593b
...
@@ -51,12 +51,6 @@
...
@@ -51,12 +51,6 @@
opacity
:
0
.3
;
opacity
:
0
.3
;
}
}
&
.btn-xs
{
line-height
:
1
;
padding
:
5px
10px
;
margin-top
:
1px
;
}
&
.dropdown-toggle
{
&
.dropdown-toggle
{
.fa
{
.fa
{
color
:
inherit
;
color
:
inherit
;
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
db18593b
...
@@ -129,7 +129,7 @@
...
@@ -129,7 +129,7 @@
.icon
svg
{
.icon
svg
{
position
:
relative
;
position
:
relative
;
top
:
2px
;
top
:
2px
;
margin-right
:
$btn-
xs-side-margin
;
margin-right
:
$btn-
margin-5
;
width
:
$gl-font-size
;
width
:
$gl-font-size
;
height
:
$gl-font-size
;
height
:
$gl-font-size
;
fill
:
$orange-600
;
fill
:
$orange-600
;
...
...
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