Skip to content

Commit 8ba8f79

Browse files
Aqil-AhmadAqil-Ahmad
committed
match tickets and common dashboard dropdown to talk dropdown
1 parent 2c86d5c commit 8ba8f79

File tree

2 files changed

+124
-28
lines changed

2 files changed

+124
-28
lines changed

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

Lines changed: 83 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -818,53 +818,79 @@ h1 .label {
818818
margin-bottom: 5px;
819819
}
820820
}
821-
.popover{
822-
padding: 0;
821+
.popover {
822+
border-radius: 0 !important;
823+
border: none !important;
824+
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;
825+
padding: 0 !important;
826+
827+
&.bottom {
828+
margin-top: -10px !important;
829+
}
830+
831+
> .arrow {
832+
display: none !important;
833+
}
823834
}
824835
.popover-content {
825836
position: relative;
826-
padding: 5px 0;
827-
min-width: 200px;
837+
padding: 0;
838+
min-width: 192px;
828839
#submenu {
829840
position: absolute;
830841
top: 0;
831-
right: 100%;
842+
right: 100%;
832843
font-size: 16px;
833844
font-weight: normal;
834845
cursor: pointer;
835846
display: none;
836-
min-width: 200px;
837-
padding: 5px 0;
838-
border-radius: 4px;
839-
z-index: 20;
847+
min-width: 224px;
848+
padding: 0;
849+
margin: 0;
850+
border-radius: 0;
851+
z-index: 9999;
840852
background-clip: padding-box;
841-
border: 1px solid rgba(0, 0, 0, 0.2);
842-
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
843-
transition: opacity 0.2s ease-in-out;
853+
border: none;
854+
box-shadow: 0 10px 15px -3px rgba(0,0,0,0.1), 0 4px 6px -4px rgba(0,0,0,0.1);
844855
}
845856
.profile-menu {
846857
color: darken($btn-primary-bg, 10%);
847-
font-size: 16px;
858+
font-size: 14px;
848859
font-weight: normal;
849860
cursor: pointer;
861+
padding: 7px 16px;
862+
line-height: 1.5;
850863
a {
851864
color: darken($btn-primary-bg, 10%) !important;
865+
padding: 0 !important;
866+
border: none !important;
867+
background: none !important;
868+
display: inline !important;
869+
line-height: 1.5;
852870
}
853871
.dashboard-item {
854872
color: darken($btn-primary-bg, 10%);
855873
}
856874
i {
857-
margin-right: 10px;
858-
width: 16px;
875+
margin-right: 8px;
876+
width: 12px;
859877
text-align: center;
878+
font-size: 12px;
879+
vertical-align: middle;
860880
}
861881
&.separator {
862-
height: 1px;
863-
background-color: #e5e5e5;
864-
margin: 5px 0;
882+
height: 0;
883+
background-color: transparent;
884+
margin: 0;
865885
padding: 0;
886+
display: none;
866887
}
867888
}
889+
.profile-menu:nth-child(6),
890+
.profile-menu.admin,
891+
.profile-menu:last-child {
892+
border-top: 1px solid #d1d5db;
893+
}
868894
.profile-menu:hover {
869895
color: #fff;
870896
background-color: darken($btn-primary-bg, 10%) !important;
@@ -874,26 +900,44 @@ h1 .label {
874900
}
875901
.dashboard-item {
876902
color: darken($btn-primary-bg, 10%);
877-
font-size: 16px;
903+
font-size: 12px;
878904
font-weight: normal;
879905
cursor: pointer;
906+
line-height: 1.5;
880907
i {
881-
margin-right: 10px;
882-
width: 16px;
908+
margin-right: 8px;
909+
width: 12px;
883910
text-align: center;
911+
font-size: 12px;
912+
vertical-align: middle;
884913
}
885914
.dashboard-content {
886-
min-height: 50px;
887-
padding: 15px;
915+
padding: 8px 16px;
916+
line-height: 1.5;
888917
}
889918
#submenu {
890919
display: none;
891920

892921
.submenu-item {
893922
background-color: #fff;
923+
padding: 7px 16px;
924+
font-size: 12px;
925+
line-height: 1.5;
894926

895927
a {
896928
color: darken($btn-primary-bg, 10%) !important;
929+
padding: 0 !important;
930+
border: none !important;
931+
background: none !important;
932+
display: inline !important;
933+
line-height: 1.5;
934+
}
935+
936+
i {
937+
margin-right: 7px;
938+
width: 12px;
939+
font-size: 12px;
940+
vertical-align: middle;
897941
}
898942

899943
&:hover {
@@ -911,9 +955,25 @@ h1 .label {
911955

912956
.submenu-item {
913957
background-color: #fff;
958+
padding: 8px 16px;
959+
font-size: 12px;
960+
line-height: 1.5;
914961

915962
a {
916963
color: darken($btn-primary-bg, 10%) !important;
964+
padding: 0 !important;
965+
border: none !important;
966+
background: none !important;
967+
display: inline !important;
968+
line-height: 1.5;
969+
}
970+
971+
i {
972+
margin-right: 8px;
973+
width: 12px;
974+
font-size: 12px;
975+
display: inline-block;
976+
vertical-align: middle;
917977
}
918978

919979
&:hover {

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

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,59 @@ $body-bg: #f5f5f5 !default;
7272
img {
7373
vertical-align: baseline;
7474
}
75+
.popover {
76+
border-radius: 0 !important;
77+
border: none !important;
78+
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;
79+
padding: 0 !important;
80+
81+
&.bottom {
82+
margin-top: -10px !important;
83+
}
84+
85+
> .arrow {
86+
display: none !important;
87+
}
88+
}
7589
.popover-content {
76-
padding: 8px 0;
77-
min-width: 200px;
90+
padding: 0;
91+
min-width: 192px;
7892
.profile-menu {
7993
color: darken($btn-primary-bg, 10%);
80-
font-size: 16px;
94+
font-size: 14px;
8195
font-weight: normal;
8296
cursor: pointer;
97+
padding: 7px 16px;
98+
line-height: 1.5;
8399
a {
84100
color: darken($btn-primary-bg, 10%) !important;
101+
padding: 0 !important;
102+
border: none !important;
103+
background: none !important;
104+
display: inline !important;
105+
line-height: 1.5;
85106
}
86107
i {
87-
margin-right: 10px;
88-
width: 16px;
108+
margin-right: 7px;
109+
width: 12px;
89110
text-align: center;
111+
font-size: 12px;
112+
display: inline-block;
113+
vertical-align: middle;
114+
}
115+
&.separator {
116+
height: 0;
117+
background-color: transparent;
118+
margin: 0;
119+
padding: 0;
120+
display: none;
90121
}
91122
}
123+
.profile-menu:nth-child(4),
124+
.profile-menu.admin,
125+
.profile-menu:last-child {
126+
border-top: 1px solid #d1d5db;
127+
}
92128
.profile-menu:hover {
93129
color: #fff;
94130
background-color: darken($btn-primary-bg, 10%) !important;

0 commit comments

Comments
 (0)