Skip to content

Commit 0f4954c

Browse files
Aqil-AhmadAqil-Ahmad
committed
match tickets and common dashboard dropdown to talk dropdown
1 parent 0692ad4 commit 0f4954c

File tree

2 files changed

+125
-24
lines changed

2 files changed

+125
-24
lines changed

‎app/eventyay/static/pretixcontrol/scss/main.scss‎

Lines changed: 84 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -722,49 +722,80 @@ h1 .label {
722722
}
723723
}
724724

725+
.popover {
726+
border-radius: 0 !important;
727+
border: none !important;
728+
box-shadow: 0 1px 3px 0 rgba(0,0,0,0.1), 0 1px 2px -1px rgba(0,0,0,0.1), 0 10px 15px -3px rgba(0,0,0,0.1), 0 4px 6px -4px rgba(0,0,0,0.1) !important;
729+
padding: 0 !important;
730+
731+
&.bottom {
732+
margin-top: -10px !important;
733+
}
734+
735+
> .arrow {
736+
display: none !important;
737+
}
738+
}
739+
725740
.popover-content {
726741
position: relative;
727-
padding: 5px 0;
728-
min-width: 200px;
742+
padding: 0;
743+
min-width: 192px;
729744
#submenu {
730745
position: absolute;
731746
top: 0;
732-
right: 101%;
747+
right: 100%;
733748
font-size: 16px;
734749
font-weight: normal;
735750
cursor: pointer;
736751
display: none;
737-
min-width: 200px;
738-
padding: 5px 0;
739-
border-radius: 4px;
752+
min-width: 224px;
753+
padding: 0;
754+
margin: 0;
755+
border-radius: 0;
740756
z-index: 9999;
741757
background-clip: padding-box;
742-
border: 1px solid rgba(0, 0, 0, 0.2);
743-
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
758+
border: none;
759+
box-shadow: 0 10px 15px -3px rgba(0,0,0,0.1), 0 4px 6px -4px rgba(0,0,0,0.1);
744760
}
745761
.profile-menu {
746762
color: darken($btn-primary-bg, 10%);
747-
font-size: 16px;
763+
font-size: 14px;
748764
font-weight: normal;
749765
cursor: pointer;
766+
padding: 7px 16px;
767+
line-height: 1.5;
750768
a {
751769
color: darken($btn-primary-bg, 10%) !important;
770+
padding: 0 !important;
771+
border: none !important;
772+
background: none !important;
773+
display: inline !important;
774+
line-height: 1.5;
752775
}
753776
.dashboard-item {
754777
color: darken($btn-primary-bg, 10%);
755778
}
756779
i {
757-
margin-right: 10px;
758-
width: 16px;
780+
margin-right: 8px;
781+
width: 12px;
759782
text-align: center;
783+
font-size: 12px;
784+
vertical-align: middle;
760785
}
761786
&.separator {
762-
height: 1px;
763-
background-color: #e5e5e5;
764-
margin: 5px 0;
787+
height: 0;
788+
background-color: transparent;
789+
margin: 0;
765790
padding: 0;
791+
display: none;
766792
}
767793
}
794+
.profile-menu:nth-child(6),
795+
.profile-menu.admin,
796+
.profile-menu:last-child {
797+
border-top: 1px solid #d1d5db;
798+
}
768799
.profile-menu:hover {
769800
color: #fff;
770801
background-color: darken($btn-primary-bg, 10%) !important;
@@ -774,26 +805,44 @@ h1 .label {
774805
}
775806
.dashboard-item {
776807
color: darken($btn-primary-bg, 10%);
777-
font-size: 16px;
808+
font-size: 12px;
778809
font-weight: normal;
779810
cursor: pointer;
811+
line-height: 1.5;
780812
i {
781-
margin-right: 10px;
782-
width: 16px;
813+
margin-right: 8px;
814+
width: 12px;
783815
text-align: center;
816+
font-size: 12px;
817+
vertical-align: middle;
784818
}
785819
.dashboard-content {
786-
min-height: 50px;
787-
padding: 15px;
820+
padding: 8px 16px;
821+
line-height: 1.5;
788822
}
789823
#submenu {
790824
display: none;
791825

792826
.submenu-item {
793827
background-color: #fff;
828+
padding: 7px 16px;
829+
font-size: 12px;
830+
line-height: 1.5;
794831

795832
a {
796833
color: darken($btn-primary-bg, 10%) !important;
834+
padding: 0 !important;
835+
border: none !important;
836+
background: none !important;
837+
display: inline !important;
838+
line-height: 1.5;
839+
}
840+
841+
i {
842+
margin-right: 7px;
843+
width: 12px;
844+
font-size: 12px;
845+
vertical-align: middle;
797846
}
798847

799848
&:hover {
@@ -811,9 +860,25 @@ h1 .label {
811860

812861
.submenu-item {
813862
background-color: #fff;
863+
padding: 8px 16px;
864+
font-size: 12px;
865+
line-height: 1.5;
814866

815867
a {
816868
color: darken($btn-primary-bg, 10%) !important;
869+
padding: 0 !important;
870+
border: none !important;
871+
background: none !important;
872+
display: inline !important;
873+
line-height: 1.5;
874+
}
875+
876+
i {
877+
margin-right: 8px;
878+
width: 12px;
879+
font-size: 12px;
880+
display: inline-block;
881+
vertical-align: middle;
817882
}
818883

819884
&:hover {

‎app/eventyay/static/pretixpresale/scss/main.scss‎

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,59 @@ footer nav {
5959
img {
6060
vertical-align: baseline;
6161
}
62+
.popover {
63+
border-radius: 0 !important;
64+
border: none !important;
65+
box-shadow: 0 1px 3px 0 rgba(0,0,0,0.1), 0 1px 2px -1px rgba(0,0,0,0.1), 0 10px 15px -3px rgba(0,0,0,0.1), 0 4px 6px -4px rgba(0,0,0,0.1) !important;
66+
padding: 0 !important;
67+
68+
&.bottom {
69+
margin-top: -10px !important;
70+
}
71+
72+
> .arrow {
73+
display: none !important;
74+
}
75+
}
6276
.popover-content {
63-
padding: 8px 0;
64-
min-width: 200px;
77+
padding: 0;
78+
min-width: 192px;
6579
.profile-menu {
6680
color: darken($btn-primary-bg, 10%);
67-
font-size: 16px;
81+
font-size: 14px;
6882
font-weight: normal;
6983
cursor: pointer;
84+
padding: 7px 16px;
85+
line-height: 1.5;
7086
a {
7187
color: darken($btn-primary-bg, 10%) !important;
88+
padding: 0 !important;
89+
border: none !important;
90+
background: none !important;
91+
display: inline !important;
92+
line-height: 1.5;
7293
}
7394
i {
74-
margin-right: 10px;
75-
width: 16px;
95+
margin-right: 7px;
96+
width: 12px;
7697
text-align: center;
98+
font-size: 12px;
99+
display: inline-block;
100+
vertical-align: middle;
101+
}
102+
&.separator {
103+
height: 0;
104+
background-color: transparent;
105+
margin: 0;
106+
padding: 0;
107+
display: none;
77108
}
78109
}
110+
.profile-menu:nth-child(4),
111+
.profile-menu.admin,
112+
.profile-menu:last-child {
113+
border-top: 1px solid #d1d5db;
114+
}
79115
.profile-menu:hover {
80116
color: #fff;
81117
background-color: darken($btn-primary-bg, 10%) !important;

0 commit comments

Comments
 (0)