Skip to content

G
gitlab-ce
Commit 1fadfa8b authored by Denys Mishunov's avatar Denys Mishunov
Browse files
Options

Re-generated Startup CSS files

parent 7945d196
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 112 deletions
ee/app/assets/stylesheets/startup/startup-dark.scss
View file @ 1fadfa8b
...@@ -930,7 +930,7 @@ input { ...@@ -930,7 +930,7 @@ input {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.page-with-contextual-sidebar { .page-with-contextual-sidebar {
padding-left: 50px; padding-left: 48px;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
...@@ -940,7 +940,7 @@ input { ...@@ -940,7 +940,7 @@ input {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.page-with-icon-sidebar { .page-with-icon-sidebar {
padding-left: 50px; padding-left: 48px;
} }
} }
.nav-sidebar { .nav-sidebar {
...@@ -960,7 +960,7 @@ input { ...@@ -960,7 +960,7 @@ input {
} }
} }
.nav-sidebar.sidebar-collapsed-desktop { .nav-sidebar.sidebar-collapsed-desktop {
width: 50px; width: 48px;
} }
.nav-sidebar.sidebar-collapsed-desktop .nav-sidebar-inner-scroll { .nav-sidebar.sidebar-collapsed-desktop .nav-sidebar-inner-scroll {
overflow-x: hidden; overflow-x: hidden;
...@@ -1026,7 +1026,7 @@ input { ...@@ -1026,7 +1026,7 @@ input {
} }
@media (min-width: 768px) and (max-width: 1199px) { @media (min-width: 768px) and (max-width: 1199px) {
.nav-sidebar:not(.sidebar-expanded-mobile) { .nav-sidebar:not(.sidebar-expanded-mobile) {
width: 50px; width: 48px;
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar-inner-scroll { .nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar-inner-scroll {
overflow-x: hidden; overflow-x: hidden;
...@@ -1055,7 +1055,7 @@ input { ...@@ -1055,7 +1055,7 @@ input {
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .context-header { .nav-sidebar:not(.sidebar-expanded-mobile) .context-header {
height: 60px; height: 60px;
width: 50px; width: 48px;
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .context-header a { .nav-sidebar:not(.sidebar-expanded-mobile) .context-header a {
padding: 10px 4px; padding: 10px 4px;
...@@ -1082,7 +1082,7 @@ input { ...@@ -1082,7 +1082,7 @@ input {
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .toggle-sidebar-button { .nav-sidebar:not(.sidebar-expanded-mobile) .toggle-sidebar-button {
padding: 16px; padding: 16px;
width: 49px; width: 47px;
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button .toggle-sidebar-button
...@@ -1172,7 +1172,7 @@ input { ...@@ -1172,7 +1172,7 @@ input {
} }
.sidebar-collapsed-desktop .context-header { .sidebar-collapsed-desktop .context-header {
height: 60px; height: 60px;
width: 50px; width: 48px;
} }
.sidebar-collapsed-desktop .context-header a { .sidebar-collapsed-desktop .context-header a {
padding: 10px 4px; padding: 10px 4px;
...@@ -1199,7 +1199,7 @@ input { ...@@ -1199,7 +1199,7 @@ input {
} }
.sidebar-collapsed-desktop .toggle-sidebar-button { .sidebar-collapsed-desktop .toggle-sidebar-button {
padding: 16px; padding: 16px;
width: 49px; width: 47px;
} }
.sidebar-collapsed-desktop .toggle-sidebar-button .collapse-text, .sidebar-collapsed-desktop .toggle-sidebar-button .collapse-text,
.sidebar-collapsed-desktop .toggle-sidebar-button .icon-chevron-double-lg-left { .sidebar-collapsed-desktop .toggle-sidebar-button .icon-chevron-double-lg-left {
...@@ -1273,7 +1273,7 @@ body.sidebar-refactoring .nav-sidebar li.active { ...@@ -1273,7 +1273,7 @@ body.sidebar-refactoring .nav-sidebar li.active {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
body.sidebar-refactoring .page-with-contextual-sidebar { body.sidebar-refactoring .page-with-contextual-sidebar {
padding-left: 50px; padding-left: 48px;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
...@@ -1283,26 +1283,21 @@ body.sidebar-refactoring .nav-sidebar li.active { ...@@ -1283,26 +1283,21 @@ body.sidebar-refactoring .nav-sidebar li.active {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
body.sidebar-refactoring .page-with-icon-sidebar { body.sidebar-refactoring .page-with-icon-sidebar {
padding-left: 50px; padding-left: 48px;
} }
} }
body.sidebar-refactoring .nav-sidebar { body.sidebar-refactoring .nav-sidebar {
position: fixed; position: fixed;
bottom: 0;
left: 0;
z-index: 600; z-index: 600;
width: 220px; width: 220px;
top: 40px; top: 40px;
bottom: 0;
left: 0;
background-color: #303030; background-color: #303030;
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
} }
@media (min-width: 576px) and (max-width: 576px) {
body.sidebar-refactoring .nav-sidebar:not(.sidebar-collapsed-desktop) {
box-shadow: inset -1px 0 0 #404040, 2px 1px 3px rgba(0, 0, 0, 0.1);
}
}
body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop { body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop {
width: 50px; width: 48px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar.sidebar-collapsed-desktop .nav-sidebar.sidebar-collapsed-desktop
...@@ -1312,7 +1307,8 @@ body.sidebar-refactoring ...@@ -1312,7 +1307,8 @@ body.sidebar-refactoring
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar.sidebar-collapsed-desktop .nav-sidebar.sidebar-collapsed-desktop
.badge.badge-pill:not(.fly-out-badge), .badge.badge-pill:not(.fly-out-badge),
body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop .nav-item-name { body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop .nav-item-name,
body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop .collapse-text {
border: 0; border: 0;
clip: rect(0, 0, 0, 0); clip: rect(0, 0, 0, 0);
height: 1px; height: 1px;
...@@ -1328,7 +1324,7 @@ body.sidebar-refactoring ...@@ -1328,7 +1324,7 @@ body.sidebar-refactoring
.sidebar-top-level-items .sidebar-top-level-items
> li > li
> a { > a {
min-height: 45px; min-height: unset;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar.sidebar-collapsed-desktop .nav-sidebar.sidebar-collapsed-desktop
...@@ -1340,6 +1336,9 @@ body.sidebar-refactoring ...@@ -1340,6 +1336,9 @@ body.sidebar-refactoring
.avatar-container { .avatar-container {
margin: 0 auto; margin: 0 auto;
} }
body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop li.active > a {
background-color: rgba(41, 41, 97, 0.08);
}
body.sidebar-refactoring .nav-sidebar a { body.sidebar-refactoring .nav-sidebar a {
text-decoration: none; text-decoration: none;
line-height: 1rem; line-height: 1rem;
...@@ -1386,7 +1385,7 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1386,7 +1385,7 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
} }
@media (min-width: 768px) and (max-width: 1199px) { @media (min-width: 768px) and (max-width: 1199px) {
body.sidebar-refactoring .nav-sidebar:not(.sidebar-expanded-mobile) { body.sidebar-refactoring .nav-sidebar:not(.sidebar-expanded-mobile) {
width: 50px; width: 48px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
...@@ -1398,7 +1397,10 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1398,7 +1397,10 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
.badge.badge-pill:not(.fly-out-badge), .badge.badge-pill:not(.fly-out-badge),
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.nav-item-name { .nav-item-name,
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
.collapse-text {
border: 0; border: 0;
clip: rect(0, 0, 0, 0); clip: rect(0, 0, 0, 0);
height: 1px; height: 1px;
...@@ -1414,7 +1416,7 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1414,7 +1416,7 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
.sidebar-top-level-items .sidebar-top-level-items
> li > li
> a { > a {
min-height: 45px; min-height: unset;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
...@@ -1426,11 +1428,17 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1426,11 +1428,17 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
.avatar-container { .avatar-container {
margin: 0 auto; margin: 0 auto;
} }
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
li.active
> a {
background-color: rgba(41, 41, 97, 0.08);
}
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.context-header { .context-header {
height: 60px; height: 60px;
width: 50px; width: 48px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
...@@ -1451,6 +1459,17 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1451,6 +1459,17 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
white-space: nowrap; white-space: nowrap;
width: 1px; width: 1px;
} }
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
.context-header {
height: auto;
}
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
.context-header
a {
padding: 0.25rem;
}
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.sidebar-top-level-items .sidebar-top-level-items
...@@ -1466,23 +1485,19 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1466,23 +1485,19 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button { .toggle-sidebar-button {
padding: 16px; width: 48px;
width: 49px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button .toggle-sidebar-button
.collapse-text, .collapse-text {
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button
.icon-chevron-double-lg-left {
display: none; display: none;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button .toggle-sidebar-button
.icon-chevron-double-lg-right { .icon-chevron-double-lg-left {
transform: rotate(180deg);
display: block; display: block;
margin: 0; margin: 0;
} }
...@@ -1507,6 +1522,7 @@ body.sidebar-refactoring .nav-sidebar-inner-scroll > div.context-header a { ...@@ -1507,6 +1522,7 @@ body.sidebar-refactoring .nav-sidebar-inner-scroll > div.context-header a {
margin: 1px 4px; margin: 1px 4px;
padding: 0.25rem; padding: 0.25rem;
margin-bottom: 0.25rem; margin-bottom: 0.25rem;
margin-top: 0;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar-inner-scroll .nav-sidebar-inner-scroll
...@@ -1547,6 +1563,7 @@ body.sidebar-refactoring .sidebar-top-level-items { ...@@ -1547,6 +1563,7 @@ body.sidebar-refactoring .sidebar-top-level-items {
body.sidebar-refactoring .sidebar-top-level-items .context-header a { body.sidebar-refactoring .sidebar-top-level-items .context-header a {
padding: 0.25rem; padding: 0.25rem;
margin-bottom: 0.25rem; margin-bottom: 0.25rem;
margin-top: 0;
} }
body.sidebar-refactoring body.sidebar-refactoring
.sidebar-top-level-items .sidebar-top-level-items
...@@ -1619,7 +1636,11 @@ body.sidebar-refactoring .close-nav-button { ...@@ -1619,7 +1636,11 @@ body.sidebar-refactoring .close-nav-button {
display: flex; display: flex;
align-items: center; align-items: center;
background-color: #303030; background-color: #303030;
border-top: 1px solid #404040;
color: #2f2a6b; color: #2f2a6b;
position: fixed;
bottom: 0;
width: 220px;
} }
body.sidebar-refactoring .toggle-sidebar-button .collapse-text, body.sidebar-refactoring .toggle-sidebar-button .collapse-text,
body.sidebar-refactoring .toggle-sidebar-button .icon-chevron-double-lg-left, body.sidebar-refactoring .toggle-sidebar-button .icon-chevron-double-lg-left,
...@@ -1629,28 +1650,13 @@ body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-left, ...@@ -1629,28 +1650,13 @@ body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-left,
body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-right { body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-right {
color: inherit; color: inherit;
} }
body.sidebar-refactoring .toggle-sidebar-button,
body.sidebar-refactoring .close-nav-button {
position: fixed;
bottom: 0;
width: 219px;
border-top: 1px solid #404040;
}
body.sidebar-refactoring .toggle-sidebar-button svg,
body.sidebar-refactoring .close-nav-button svg {
margin-right: 8px;
}
body.sidebar-refactoring .toggle-sidebar-button .icon-chevron-double-lg-right,
body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-right {
display: none;
}
body.sidebar-refactoring .collapse-text { body.sidebar-refactoring .collapse-text {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
body.sidebar-refactoring .sidebar-collapsed-desktop .context-header { body.sidebar-refactoring .sidebar-collapsed-desktop .context-header {
height: 60px; height: 60px;
width: 50px; width: 48px;
} }
body.sidebar-refactoring .sidebar-collapsed-desktop .context-header a { body.sidebar-refactoring .sidebar-collapsed-desktop .context-header a {
padding: 10px 4px; padding: 10px 4px;
...@@ -1666,6 +1672,12 @@ body.sidebar-refactoring .sidebar-collapsed-desktop .sidebar-context-title { ...@@ -1666,6 +1672,12 @@ body.sidebar-refactoring .sidebar-collapsed-desktop .sidebar-context-title {
white-space: nowrap; white-space: nowrap;
width: 1px; width: 1px;
} }
body.sidebar-refactoring .sidebar-collapsed-desktop .context-header {
height: auto;
}
body.sidebar-refactoring .sidebar-collapsed-desktop .context-header a {
padding: 0.25rem;
}
body.sidebar-refactoring body.sidebar-refactoring
.sidebar-collapsed-desktop .sidebar-collapsed-desktop
.sidebar-top-level-items .sidebar-top-level-items
...@@ -1677,23 +1689,19 @@ body.sidebar-refactoring .sidebar-collapsed-desktop .nav-icon-container { ...@@ -1677,23 +1689,19 @@ body.sidebar-refactoring .sidebar-collapsed-desktop .nav-icon-container {
margin-right: 0; margin-right: 0;
} }
body.sidebar-refactoring .sidebar-collapsed-desktop .toggle-sidebar-button { body.sidebar-refactoring .sidebar-collapsed-desktop .toggle-sidebar-button {
padding: 16px; width: 48px;
width: 49px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.sidebar-collapsed-desktop .sidebar-collapsed-desktop
.toggle-sidebar-button .toggle-sidebar-button
.collapse-text, .collapse-text {
body.sidebar-refactoring
.sidebar-collapsed-desktop
.toggle-sidebar-button
.icon-chevron-double-lg-left {
display: none; display: none;
} }
body.sidebar-refactoring body.sidebar-refactoring
.sidebar-collapsed-desktop .sidebar-collapsed-desktop
.toggle-sidebar-button .toggle-sidebar-button
.icon-chevron-double-lg-right { .icon-chevron-double-lg-left {
transform: rotate(180deg);
display: block; display: block;
margin: 0; margin: 0;
} }
...@@ -1834,6 +1842,12 @@ svg.s16 { ...@@ -1834,6 +1842,12 @@ svg.s16 {
height: 32px; height: 32px;
margin-right: 8px; margin-right: 8px;
} }
.avatar.s40,
.avatar-container.s40 {
width: 40px;
height: 40px;
margin-right: 8px;
}
.avatar { .avatar {
transition-property: none; transition-property: none;
width: 40px; width: 40px;
...@@ -1861,6 +1875,10 @@ svg.s16 { ...@@ -1861,6 +1875,10 @@ svg.s16 {
font-size: 14px; font-size: 14px;
line-height: 32px; line-height: 32px;
} }
.identicon.s40 {
font-size: 16px;
line-height: 38px;
}
.identicon.bg1 { .identicon.bg1 {
background-color: #ffebee; background-color: #ffebee;
} }
...@@ -1900,6 +1918,10 @@ svg.s16 { ...@@ -1900,6 +1918,10 @@ svg.s16 {
margin: 0; margin: 0;
align-self: center; align-self: center;
} }
.avatar-container.s40 {
min-width: 40px;
min-height: 40px;
}
.rect-avatar { .rect-avatar {
border-radius: 2px; border-radius: 2px;
} }
...@@ -1924,6 +1946,9 @@ body.sidebar-refactoring ...@@ -1924,6 +1946,9 @@ body.sidebar-refactoring
.avatar.s32 { .avatar.s32 {
border-radius: 4px; border-radius: 4px;
} }
.rect-avatar.s40 {
border-radius: 4px;
}
body.gl-dark .navbar-gitlab { body.gl-dark .navbar-gitlab {
background-color: #fafafa; background-color: #fafafa;
} }
......
ee/app/assets/stylesheets/startup/startup-general.scss
View file @ 1fadfa8b
...@@ -915,7 +915,7 @@ input { ...@@ -915,7 +915,7 @@ input {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.page-with-contextual-sidebar { .page-with-contextual-sidebar {
padding-left: 50px; padding-left: 48px;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
...@@ -925,7 +925,7 @@ input { ...@@ -925,7 +925,7 @@ input {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
.page-with-icon-sidebar { .page-with-icon-sidebar {
padding-left: 50px; padding-left: 48px;
} }
} }
.nav-sidebar { .nav-sidebar {
...@@ -945,7 +945,7 @@ input { ...@@ -945,7 +945,7 @@ input {
} }
} }
.nav-sidebar.sidebar-collapsed-desktop { .nav-sidebar.sidebar-collapsed-desktop {
width: 50px; width: 48px;
} }
.nav-sidebar.sidebar-collapsed-desktop .nav-sidebar-inner-scroll { .nav-sidebar.sidebar-collapsed-desktop .nav-sidebar-inner-scroll {
overflow-x: hidden; overflow-x: hidden;
...@@ -1011,7 +1011,7 @@ input { ...@@ -1011,7 +1011,7 @@ input {
} }
@media (min-width: 768px) and (max-width: 1199px) { @media (min-width: 768px) and (max-width: 1199px) {
.nav-sidebar:not(.sidebar-expanded-mobile) { .nav-sidebar:not(.sidebar-expanded-mobile) {
width: 50px; width: 48px;
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar-inner-scroll { .nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar-inner-scroll {
overflow-x: hidden; overflow-x: hidden;
...@@ -1040,7 +1040,7 @@ input { ...@@ -1040,7 +1040,7 @@ input {
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .context-header { .nav-sidebar:not(.sidebar-expanded-mobile) .context-header {
height: 60px; height: 60px;
width: 50px; width: 48px;
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .context-header a { .nav-sidebar:not(.sidebar-expanded-mobile) .context-header a {
padding: 10px 4px; padding: 10px 4px;
...@@ -1067,7 +1067,7 @@ input { ...@@ -1067,7 +1067,7 @@ input {
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .toggle-sidebar-button { .nav-sidebar:not(.sidebar-expanded-mobile) .toggle-sidebar-button {
padding: 16px; padding: 16px;
width: 49px; width: 47px;
} }
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button .toggle-sidebar-button
...@@ -1157,7 +1157,7 @@ input { ...@@ -1157,7 +1157,7 @@ input {
} }
.sidebar-collapsed-desktop .context-header { .sidebar-collapsed-desktop .context-header {
height: 60px; height: 60px;
width: 50px; width: 48px;
} }
.sidebar-collapsed-desktop .context-header a { .sidebar-collapsed-desktop .context-header a {
padding: 10px 4px; padding: 10px 4px;
...@@ -1184,7 +1184,7 @@ input { ...@@ -1184,7 +1184,7 @@ input {
} }
.sidebar-collapsed-desktop .toggle-sidebar-button { .sidebar-collapsed-desktop .toggle-sidebar-button {
padding: 16px; padding: 16px;
width: 49px; width: 47px;
} }
.sidebar-collapsed-desktop .toggle-sidebar-button .collapse-text, .sidebar-collapsed-desktop .toggle-sidebar-button .collapse-text,
.sidebar-collapsed-desktop .toggle-sidebar-button .icon-chevron-double-lg-left { .sidebar-collapsed-desktop .toggle-sidebar-button .icon-chevron-double-lg-left {
...@@ -1235,7 +1235,7 @@ body.sidebar-refactoring .nav-sidebar li.active { ...@@ -1235,7 +1235,7 @@ body.sidebar-refactoring .nav-sidebar li.active {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
body.sidebar-refactoring .page-with-contextual-sidebar { body.sidebar-refactoring .page-with-contextual-sidebar {
padding-left: 50px; padding-left: 48px;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
...@@ -1245,26 +1245,21 @@ body.sidebar-refactoring .nav-sidebar li.active { ...@@ -1245,26 +1245,21 @@ body.sidebar-refactoring .nav-sidebar li.active {
} }
@media (min-width: 768px) { @media (min-width: 768px) {
body.sidebar-refactoring .page-with-icon-sidebar { body.sidebar-refactoring .page-with-icon-sidebar {
padding-left: 50px; padding-left: 48px;
} }
} }
body.sidebar-refactoring .nav-sidebar { body.sidebar-refactoring .nav-sidebar {
position: fixed; position: fixed;
bottom: 0;
left: 0;
z-index: 600; z-index: 600;
width: 220px; width: 220px;
top: 40px; top: 40px;
bottom: 0;
left: 0;
background-color: #f0f0f0; background-color: #f0f0f0;
transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);
} }
@media (min-width: 576px) and (max-width: 576px) {
body.sidebar-refactoring .nav-sidebar:not(.sidebar-collapsed-desktop) {
box-shadow: inset -1px 0 0 #dbdbdb, 2px 1px 3px rgba(0, 0, 0, 0.1);
}
}
body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop { body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop {
width: 50px; width: 48px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar.sidebar-collapsed-desktop .nav-sidebar.sidebar-collapsed-desktop
...@@ -1274,7 +1269,8 @@ body.sidebar-refactoring ...@@ -1274,7 +1269,8 @@ body.sidebar-refactoring
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar.sidebar-collapsed-desktop .nav-sidebar.sidebar-collapsed-desktop
.badge.badge-pill:not(.fly-out-badge), .badge.badge-pill:not(.fly-out-badge),
body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop .nav-item-name { body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop .nav-item-name,
body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop .collapse-text {
border: 0; border: 0;
clip: rect(0, 0, 0, 0); clip: rect(0, 0, 0, 0);
height: 1px; height: 1px;
...@@ -1290,7 +1286,7 @@ body.sidebar-refactoring ...@@ -1290,7 +1286,7 @@ body.sidebar-refactoring
.sidebar-top-level-items .sidebar-top-level-items
> li > li
> a { > a {
min-height: 45px; min-height: unset;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar.sidebar-collapsed-desktop .nav-sidebar.sidebar-collapsed-desktop
...@@ -1302,6 +1298,9 @@ body.sidebar-refactoring ...@@ -1302,6 +1298,9 @@ body.sidebar-refactoring
.avatar-container { .avatar-container {
margin: 0 auto; margin: 0 auto;
} }
body.sidebar-refactoring .nav-sidebar.sidebar-collapsed-desktop li.active > a {
background-color: rgba(41, 41, 97, 0.08);
}
body.sidebar-refactoring .nav-sidebar a { body.sidebar-refactoring .nav-sidebar a {
text-decoration: none; text-decoration: none;
line-height: 1rem; line-height: 1rem;
...@@ -1348,7 +1347,7 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1348,7 +1347,7 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
} }
@media (min-width: 768px) and (max-width: 1199px) { @media (min-width: 768px) and (max-width: 1199px) {
body.sidebar-refactoring .nav-sidebar:not(.sidebar-expanded-mobile) { body.sidebar-refactoring .nav-sidebar:not(.sidebar-expanded-mobile) {
width: 50px; width: 48px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
...@@ -1360,7 +1359,10 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1360,7 +1359,10 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
.badge.badge-pill:not(.fly-out-badge), .badge.badge-pill:not(.fly-out-badge),
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.nav-item-name { .nav-item-name,
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
.collapse-text {
border: 0; border: 0;
clip: rect(0, 0, 0, 0); clip: rect(0, 0, 0, 0);
height: 1px; height: 1px;
...@@ -1376,7 +1378,7 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1376,7 +1378,7 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
.sidebar-top-level-items .sidebar-top-level-items
> li > li
> a { > a {
min-height: 45px; min-height: unset;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
...@@ -1388,11 +1390,17 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1388,11 +1390,17 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
.avatar-container { .avatar-container {
margin: 0 auto; margin: 0 auto;
} }
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
li.active
> a {
background-color: rgba(41, 41, 97, 0.08);
}
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.context-header { .context-header {
height: 60px; height: 60px;
width: 50px; width: 48px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
...@@ -1413,6 +1421,17 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1413,6 +1421,17 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
white-space: nowrap; white-space: nowrap;
width: 1px; width: 1px;
} }
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
.context-header {
height: auto;
}
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
.context-header
a {
padding: 0.25rem;
}
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.sidebar-top-level-items .sidebar-top-level-items
...@@ -1428,23 +1447,19 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item { ...@@ -1428,23 +1447,19 @@ body.sidebar-refactoring .nav-sidebar .fly-out-top-item {
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button { .toggle-sidebar-button {
padding: 16px; width: 48px;
width: 49px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button .toggle-sidebar-button
.collapse-text, .collapse-text {
body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button
.icon-chevron-double-lg-left {
display: none; display: none;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar:not(.sidebar-expanded-mobile) .nav-sidebar:not(.sidebar-expanded-mobile)
.toggle-sidebar-button .toggle-sidebar-button
.icon-chevron-double-lg-right { .icon-chevron-double-lg-left {
transform: rotate(180deg);
display: block; display: block;
margin: 0; margin: 0;
} }
...@@ -1469,6 +1484,7 @@ body.sidebar-refactoring .nav-sidebar-inner-scroll > div.context-header a { ...@@ -1469,6 +1484,7 @@ body.sidebar-refactoring .nav-sidebar-inner-scroll > div.context-header a {
margin: 1px 4px; margin: 1px 4px;
padding: 0.25rem; padding: 0.25rem;
margin-bottom: 0.25rem; margin-bottom: 0.25rem;
margin-top: 0;
} }
body.sidebar-refactoring body.sidebar-refactoring
.nav-sidebar-inner-scroll .nav-sidebar-inner-scroll
...@@ -1509,6 +1525,7 @@ body.sidebar-refactoring .sidebar-top-level-items { ...@@ -1509,6 +1525,7 @@ body.sidebar-refactoring .sidebar-top-level-items {
body.sidebar-refactoring .sidebar-top-level-items .context-header a { body.sidebar-refactoring .sidebar-top-level-items .context-header a {
padding: 0.25rem; padding: 0.25rem;
margin-bottom: 0.25rem; margin-bottom: 0.25rem;
margin-top: 0;
} }
body.sidebar-refactoring body.sidebar-refactoring
.sidebar-top-level-items .sidebar-top-level-items
...@@ -1581,7 +1598,11 @@ body.sidebar-refactoring .close-nav-button { ...@@ -1581,7 +1598,11 @@ body.sidebar-refactoring .close-nav-button {
display: flex; display: flex;
align-items: center; align-items: center;
background-color: #f0f0f0; background-color: #f0f0f0;
border-top: 1px solid #dbdbdb;
color: #2f2a6b; color: #2f2a6b;
position: fixed;
bottom: 0;
width: 220px;
} }
body.sidebar-refactoring .toggle-sidebar-button .collapse-text, body.sidebar-refactoring .toggle-sidebar-button .collapse-text,
body.sidebar-refactoring .toggle-sidebar-button .icon-chevron-double-lg-left, body.sidebar-refactoring .toggle-sidebar-button .icon-chevron-double-lg-left,
...@@ -1591,28 +1612,13 @@ body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-left, ...@@ -1591,28 +1612,13 @@ body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-left,
body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-right { body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-right {
color: inherit; color: inherit;
} }
body.sidebar-refactoring .toggle-sidebar-button,
body.sidebar-refactoring .close-nav-button {
position: fixed;
bottom: 0;
width: 219px;
border-top: 1px solid #dbdbdb;
}
body.sidebar-refactoring .toggle-sidebar-button svg,
body.sidebar-refactoring .close-nav-button svg {
margin-right: 8px;
}
body.sidebar-refactoring .toggle-sidebar-button .icon-chevron-double-lg-right,
body.sidebar-refactoring .close-nav-button .icon-chevron-double-lg-right {
display: none;
}
body.sidebar-refactoring .collapse-text { body.sidebar-refactoring .collapse-text {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
body.sidebar-refactoring .sidebar-collapsed-desktop .context-header { body.sidebar-refactoring .sidebar-collapsed-desktop .context-header {
height: 60px; height: 60px;
width: 50px; width: 48px;
} }
body.sidebar-refactoring .sidebar-collapsed-desktop .context-header a { body.sidebar-refactoring .sidebar-collapsed-desktop .context-header a {
padding: 10px 4px; padding: 10px 4px;
...@@ -1628,6 +1634,12 @@ body.sidebar-refactoring .sidebar-collapsed-desktop .sidebar-context-title { ...@@ -1628,6 +1634,12 @@ body.sidebar-refactoring .sidebar-collapsed-desktop .sidebar-context-title {
white-space: nowrap; white-space: nowrap;
width: 1px; width: 1px;
} }
body.sidebar-refactoring .sidebar-collapsed-desktop .context-header {
height: auto;
}
body.sidebar-refactoring .sidebar-collapsed-desktop .context-header a {
padding: 0.25rem;
}
body.sidebar-refactoring body.sidebar-refactoring
.sidebar-collapsed-desktop .sidebar-collapsed-desktop
.sidebar-top-level-items .sidebar-top-level-items
...@@ -1639,23 +1651,19 @@ body.sidebar-refactoring .sidebar-collapsed-desktop .nav-icon-container { ...@@ -1639,23 +1651,19 @@ body.sidebar-refactoring .sidebar-collapsed-desktop .nav-icon-container {
margin-right: 0; margin-right: 0;
} }
body.sidebar-refactoring .sidebar-collapsed-desktop .toggle-sidebar-button { body.sidebar-refactoring .sidebar-collapsed-desktop .toggle-sidebar-button {
padding: 16px; width: 48px;
width: 49px;
} }
body.sidebar-refactoring body.sidebar-refactoring
.sidebar-collapsed-desktop .sidebar-collapsed-desktop
.toggle-sidebar-button .toggle-sidebar-button
.collapse-text, .collapse-text {
body.sidebar-refactoring
.sidebar-collapsed-desktop
.toggle-sidebar-button
.icon-chevron-double-lg-left {
display: none; display: none;
} }
body.sidebar-refactoring body.sidebar-refactoring
.sidebar-collapsed-desktop .sidebar-collapsed-desktop
.toggle-sidebar-button .toggle-sidebar-button
.icon-chevron-double-lg-right { .icon-chevron-double-lg-left {
transform: rotate(180deg);
display: block; display: block;
margin: 0; margin: 0;
} }
...@@ -1796,6 +1804,12 @@ svg.s16 { ...@@ -1796,6 +1804,12 @@ svg.s16 {
height: 32px; height: 32px;
margin-right: 8px; margin-right: 8px;
} }
.avatar.s40,
.avatar-container.s40 {
width: 40px;
height: 40px;
margin-right: 8px;
}
.avatar { .avatar {
transition-property: none; transition-property: none;
width: 40px; width: 40px;
...@@ -1823,6 +1837,10 @@ svg.s16 { ...@@ -1823,6 +1837,10 @@ svg.s16 {
font-size: 14px; font-size: 14px;
line-height: 32px; line-height: 32px;
} }
.identicon.s40 {
font-size: 16px;
line-height: 38px;
}
.identicon.bg1 { .identicon.bg1 {
background-color: #ffebee; background-color: #ffebee;
} }
...@@ -1862,6 +1880,10 @@ svg.s16 { ...@@ -1862,6 +1880,10 @@ svg.s16 {
margin: 0; margin: 0;
align-self: center; align-self: center;
} }
.avatar-container.s40 {
min-width: 40px;
min-height: 40px;
}
.rect-avatar { .rect-avatar {
border-radius: 2px; border-radius: 2px;
} }
...@@ -1886,6 +1908,9 @@ body.sidebar-refactoring ...@@ -1886,6 +1908,9 @@ body.sidebar-refactoring
.avatar.s32 { .avatar.s32 {
border-radius: 4px; border-radius: 4px;
} }
.rect-avatar.s40 {
border-radius: 4px;
}
.tab-width-8 { .tab-width-8 {
-moz-tab-size: 8; -moz-tab-size: 8;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7