Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Stud.IP
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jan-Hendrik Willms
Stud.IP
Commits
3f0c8b22
Commit
3f0c8b22
authored
5 months ago
by
Ron Lucke
Browse files
Options
Downloads
Patches
Plain Diff
Buttons
Closes
#4732
Merge request
!3529
parent
509f623b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
resources/assets/stylesheets/scss/buttons.scss
+4
-3
4 additions, 3 deletions
resources/assets/stylesheets/scss/buttons.scss
resources/assets/stylesheets/scss/dialog.scss
+1
-1
1 addition, 1 deletion
resources/assets/stylesheets/scss/dialog.scss
with
5 additions
and
4 deletions
resources/assets/stylesheets/scss/buttons.scss
+
4
−
3
View file @
3f0c8b22
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
@mixin
button
()
{
@mixin
button
()
{
background
:
var
(
--
color--button-background
);
background
:
var
(
--
color--button-background
);
border
:
1px
solid
var
(
--
color--button-border
);
border
:
1px
solid
var
(
--
color--button-border
);
border-radius
:
0
;
border-radius
:
4px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
color
:
var
(
--
color--button-border
);
color
:
var
(
--
color--button-border
);
cursor
:
pointer
;
cursor
:
pointer
;
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
margin
:
0
.8em
0
.6em
0
.8em
0
;
margin
:
0
.8em
0
.6em
0
.8em
0
;
min-width
:
100px
;
min-width
:
100px
;
overflow
:
visible
;
overflow
:
visible
;
padding
:
10
px
20
px
;
padding
:
7
px
14
px
;
position
:
relative
;
position
:
relative
;
text-align
:
center
;
text-align
:
center
;
text-decoration
:
none
;
text-decoration
:
none
;
...
@@ -54,7 +54,7 @@ button.button {
...
@@ -54,7 +54,7 @@ button.button {
content
:
" "
;
content
:
" "
;
float
:
left
;
float
:
left
;
height
:
16px
;
height
:
16px
;
margin
:
1px
10px
0
-5px
;
margin
:
1px
10px
0
0
;
width
:
16px
;
width
:
16px
;
}
}
}
}
...
@@ -95,6 +95,7 @@ $button-icons: (
...
@@ -95,6 +95,7 @@ $button-icons: (
@each
$class
,
$icon
in
$button-icons
{
@each
$class
,
$icon
in
$button-icons
{
.button
{
.button
{
&
.
#{
''
+
$class
}
{
&
.
#{
''
+
$class
}
{
padding-right
:
20px
;
@include
button-with-icon
(
$icon
,
clickable
,
info_alt
);
@include
button-with-icon
(
$icon
,
clickable
,
info_alt
);
&
.disabled
,
&
[
disabled
]
{
&
.disabled
,
&
[
disabled
]
{
@include
button-with-icon
(
$icon
,
inactive
,
inactive
);
@include
button-with-icon
(
$icon
,
inactive
,
inactive
);
...
...
This diff is collapsed.
Click to expand it.
resources/assets/stylesheets/scss/dialog.scss
+
1
−
1
View file @
3f0c8b22
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
&
.accept
,
&
.accept
,
&
.cancel
{
&
.cancel
{
padding-right
:
2
3
px
;
padding-right
:
2
0
px
;
}
}
&
:last-child
{
&
:last-child
{
margin-right
:
0
;
margin-right
:
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment