summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/lists.scss
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-11-03 14:02:52 -0500
committerMike Greiling <mike@pixelcog.com>2017-11-03 14:02:52 -0500
commit72157766a2c5b65bece2077c8b3eddcb8af5b374 (patch)
tree5b9c3d0d9d1392d4859c22b2584a03332b3b48c3 /app/assets/stylesheets/framework/lists.scss
parent817c7fb1b0cbd0d008706e060c4cecd0401b5f0c (diff)
parent4841c3cb4565996b1a54ef045f9f84548dcc5d6a (diff)
downloadgitlab-ce-72157766a2c5b65bece2077c8b3eddcb8af5b374.tar.gz
Merge branch 'master' into sh-headless-chrome-support
* master: (33 commits) Ignore SQL CACHE hits in Sherlock Fix SQL timings for the performance bar Find the LFS-objects for a fork within a the fork network Remove bottom-border from last responsive table row Add system hooks user_rename and group_rename Unlink a project from a fork network when it's source was deleted. Make sure the settings page renders when root of a fork is deleted Remove Peek's original keyboard shortcut (numpad 0, keycode 96) Add application setting to Auto DevOps docs Enable MergeableSelector in scss-lint (for !14567) Enable MergeableSelector in scss-lint (for !14055) Enable MergeableSelector in scss-lint (for !14062) Enable MergeableSelector in scss-lint (for !14398) Enable MergeableSelector in scss-lint (for !13480) Enable MergeableSelector in scss-lint (for !13473) Enable MergeableSelector in scss-lint (for !13600) Enable MergeableSelector in scss-lint Resolve ""To do" should be "Todos" on Todos list page" Avoid regenerating the ref path for the environment Remove white space at bottom of issue boards ...
Diffstat (limited to 'app/assets/stylesheets/framework/lists.scss')
-rw-r--r--app/assets/stylesheets/framework/lists.scss52
1 files changed, 26 insertions, 26 deletions
diff --git a/app/assets/stylesheets/framework/lists.scss b/app/assets/stylesheets/framework/lists.scss
index d43f998cb82..511608c618c 100644
--- a/app/assets/stylesheets/framework/lists.scss
+++ b/app/assets/stylesheets/framework/lists.scss
@@ -299,40 +299,40 @@ ul.indent-list {
}
}
-.group-list-tree .avatar-container.content-loading {
- position: relative;
+.group-list-tree {
+ .avatar-container.content-loading {
+ position: relative;
- > a,
- > a .avatar {
- height: 100%;
- border-radius: 50%;
- }
+ > a,
+ > a .avatar {
+ height: 100%;
+ border-radius: 50%;
+ }
- > a {
- padding: 2px;
- }
+ > a {
+ padding: 2px;
- > a .avatar {
- border: 2px solid $white-normal;
+ .avatar {
+ border: 2px solid $white-normal;
- &.identicon {
- line-height: 30px;
+ &.identicon {
+ line-height: 30px;
+ }
+ }
}
- }
- &::after {
- content: "";
- position: absolute;
- height: 100%;
- width: 100%;
- background-color: transparent;
- border: 2px outset $kdb-border;
- border-radius: 50%;
- animation: spin-avatar 3s infinite linear;
+ &::after {
+ content: "";
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ background-color: transparent;
+ border: 2px outset $kdb-border;
+ border-radius: 50%;
+ animation: spin-avatar 3s infinite linear;
+ }
}
-}
-.group-list-tree {
.folder-toggle-wrap {
float: left;
line-height: $list-text-height;