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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
80849224
Commit
80849224
authored
May 26, 2020
by
Mark Florian
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'remove-css-shims' into 'master'
Remove shim classes See merge request gitlab-org/gitlab!32874
parents
db5d4783
86658aa6
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
29 deletions
+13
-29
app/assets/stylesheets/utilities.scss
app/assets/stylesheets/utilities.scss
+0
-16
ee/app/assets/javascripts/geo_nodes/components/geo_node_sync_progress.vue
...vascripts/geo_nodes/components/geo_node_sync_progress.vue
+4
-4
ee/app/views/shared/_shared_runners_minutes_limit.html.haml
ee/app/views/shared/_shared_runners_minutes_limit.html.haml
+1
-1
ee/spec/frontend/geo_nodes/components/__snapshots__/geo_node_sync_progress_spec.js.snap
...ponents/__snapshots__/geo_node_sync_progress_spec.js.snap
+8
-8
No files found.
app/assets/stylesheets/utilities.scss
View file @
80849224
...
@@ -87,21 +87,5 @@
...
@@ -87,21 +87,5 @@
}
}
}
}
.gl-shim-h-2
{
height
:
px-to-rem
(
4px
);
}
.gl-shim-w-5
{
width
:
px-to-rem
(
16px
);
}
.gl-shim-pb-3
{
padding-bottom
:
8px
;
}
.gl-shim-pt-5
{
padding-top
:
16px
;
}
.gl-text-purple
{
color
:
$purple
;
}
.gl-text-purple
{
color
:
$purple
;
}
.gl-bg-purple-light
{
background-color
:
$purple-light
;
}
.gl-bg-purple-light
{
background-color
:
$purple-light
;
}
ee/app/assets/javascripts/geo_nodes/components/geo_node_sync_progress.vue
View file @
80849224
...
@@ -65,22 +65,22 @@ export default {
...
@@ -65,22 +65,22 @@ export default {
</template>
</template>
<section>
<section>
<div
class=
"d-flex align-items-center my-1"
>
<div
class=
"d-flex align-items-center my-1"
>
<div
class=
"mr-2 bg-transparent gl-
shim-w-5 gl-shim
-h-2"
></div>
<div
class=
"mr-2 bg-transparent gl-
w-5 gl
-h-2"
></div>
<span
class=
"flex-grow-1 mr-3"
>
{{ __('Total') }}
</span>
<span
class=
"flex-grow-1 mr-3"
>
{{ __('Total') }}
</span>
<span
class=
"font-weight-bold"
>
{{ itemValue.totalCount.toLocaleString() }}
</span>
<span
class=
"font-weight-bold"
>
{{ itemValue.totalCount.toLocaleString() }}
</span>
</div>
</div>
<div
class=
"d-flex align-items-center my-2"
>
<div
class=
"d-flex align-items-center my-2"
>
<div
class=
"mr-2 bg-success-500 gl-
shim-w-5 gl-shim
-h-2"
></div>
<div
class=
"mr-2 bg-success-500 gl-
w-5 gl
-h-2"
></div>
<span
class=
"flex-grow-1 mr-3"
>
{{ __('Synced') }}
</span>
<span
class=
"flex-grow-1 mr-3"
>
{{ __('Synced') }}
</span>
<span
class=
"font-weight-bold"
>
{{ itemValue.successCount.toLocaleString() }}
</span>
<span
class=
"font-weight-bold"
>
{{ itemValue.successCount.toLocaleString() }}
</span>
</div>
</div>
<div
class=
"d-flex align-items-center my-2"
>
<div
class=
"d-flex align-items-center my-2"
>
<div
class=
"mr-2 bg-secondary-200 gl-
shim-w-5 gl-shim
-h-2"
></div>
<div
class=
"mr-2 bg-secondary-200 gl-
w-5 gl
-h-2"
></div>
<span
class=
"flex-grow-1 mr-3"
>
{{ __('Queued') }}
</span>
<span
class=
"flex-grow-1 mr-3"
>
{{ __('Queued') }}
</span>
<span
class=
"font-weight-bold"
>
{{ queuedCount.toLocaleString() }}
</span>
<span
class=
"font-weight-bold"
>
{{ queuedCount.toLocaleString() }}
</span>
</div>
</div>
<div
class=
"d-flex align-items-center my-2"
>
<div
class=
"d-flex align-items-center my-2"
>
<div
class=
"mr-2 bg-danger-500 gl-
shim-w-5 gl-shim
-h-2"
></div>
<div
class=
"mr-2 bg-danger-500 gl-
w-5 gl
-h-2"
></div>
<span
class=
"flex-grow-1 mr-3"
>
{{ __('Failed') }}
</span>
<span
class=
"flex-grow-1 mr-3"
>
{{ __('Failed') }}
</span>
<span
class=
"font-weight-bold"
>
{{ itemValue.failureCount.toLocaleString() }}
</span>
<span
class=
"font-weight-bold"
>
{{ itemValue.failureCount.toLocaleString() }}
</span>
</div>
</div>
...
...
ee/app/views/shared/_shared_runners_minutes_limit.html.haml
View file @
80849224
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
return
unless
notification
.
show?
-
return
unless
notification
.
show?
%div
{
class:
[(
classes
if
defined?
classes
)]
}
%div
{
class:
[(
classes
if
defined?
classes
)]
}
.shared-runner-quota-message.gl-
shim-pt-5.gl-shim
-pb-3
.shared-runner-quota-message.gl-
pt-5.gl
-pb-3
.js-vue-alert
{
'v-cloak'
:
true
,
data:
{
variant:
notification
.
style
,
.js-vue-alert
{
'v-cloak'
:
true
,
data:
{
variant:
notification
.
style
,
secondary_button_text:
_
(
'Buy more Pipeline minutes'
),
secondary_button_text:
_
(
'Buy more Pipeline minutes'
),
secondary_button_link:
::
EE
::
SUBSCRIPTIONS_MORE_MINUTES_URL
,
secondary_button_link:
::
EE
::
SUBSCRIPTIONS_MORE_MINUTES_URL
,
...
...
ee/spec/frontend/geo_nodes/components/__snapshots__/geo_node_sync_progress_spec.js.snap
View file @
80849224
...
@@ -5,7 +5,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
...
@@ -5,7 +5,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
class="d-flex align-items-center my-1"
class="d-flex align-items-center my-1"
>
>
<div
<div
class="mr-2 bg-transparent gl-
shim-w-5 gl-shim
-h-2"
class="mr-2 bg-transparent gl-
w-5 gl
-h-2"
/>
/>
<span
<span
...
@@ -24,7 +24,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
...
@@ -24,7 +24,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
exports[`GeoNodeSyncProgress template GlPopover renders each row of popover correctly 2`] = `
exports[`GeoNodeSyncProgress template GlPopover renders each row of popover correctly 2`] = `
<div
<div
class="mr-2 bg-transparent gl-
shim-w-5 gl-shim
-h-2"
class="mr-2 bg-transparent gl-
w-5 gl
-h-2"
/>
/>
`;
`;
...
@@ -33,7 +33,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
...
@@ -33,7 +33,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
class="d-flex align-items-center my-2"
class="d-flex align-items-center my-2"
>
>
<div
<div
class="mr-2 bg-success-500 gl-
shim-w-5 gl-shim
-h-2"
class="mr-2 bg-success-500 gl-
w-5 gl
-h-2"
/>
/>
<span
<span
...
@@ -52,7 +52,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
...
@@ -52,7 +52,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
exports[`GeoNodeSyncProgress template GlPopover renders each row of popover correctly 4`] = `
exports[`GeoNodeSyncProgress template GlPopover renders each row of popover correctly 4`] = `
<div
<div
class="mr-2 bg-success-500 gl-
shim-w-5 gl-shim
-h-2"
class="mr-2 bg-success-500 gl-
w-5 gl
-h-2"
/>
/>
`;
`;
...
@@ -61,7 +61,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
...
@@ -61,7 +61,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
class="d-flex align-items-center my-2"
class="d-flex align-items-center my-2"
>
>
<div
<div
class="mr-2 bg-secondary-200 gl-
shim-w-5 gl-shim
-h-2"
class="mr-2 bg-secondary-200 gl-
w-5 gl
-h-2"
/>
/>
<span
<span
...
@@ -80,7 +80,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
...
@@ -80,7 +80,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
exports[`GeoNodeSyncProgress template GlPopover renders each row of popover correctly 6`] = `
exports[`GeoNodeSyncProgress template GlPopover renders each row of popover correctly 6`] = `
<div
<div
class="mr-2 bg-secondary-200 gl-
shim-w-5 gl-shim
-h-2"
class="mr-2 bg-secondary-200 gl-
w-5 gl
-h-2"
/>
/>
`;
`;
...
@@ -89,7 +89,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
...
@@ -89,7 +89,7 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
class="d-flex align-items-center my-2"
class="d-flex align-items-center my-2"
>
>
<div
<div
class="mr-2 bg-danger-500 gl-
shim-w-5 gl-shim
-h-2"
class="mr-2 bg-danger-500 gl-
w-5 gl
-h-2"
/>
/>
<span
<span
...
@@ -108,6 +108,6 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
...
@@ -108,6 +108,6 @@ exports[`GeoNodeSyncProgress template GlPopover renders each row of popover corr
exports[`GeoNodeSyncProgress template GlPopover renders each row of popover correctly 8`] = `
exports[`GeoNodeSyncProgress template GlPopover renders each row of popover correctly 8`] = `
<div
<div
class="mr-2 bg-danger-500 gl-
shim-w-5 gl-shim
-h-2"
class="mr-2 bg-danger-500 gl-
w-5 gl
-h-2"
/>
/>
`;
`;
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