Skip to content

Commit fc419fe

Browse files
Aqil-AhmadAqil-Ahmad
committed
resolve comments
1 parent 8ba8f79 commit fc419fe

File tree

4 files changed

+41
-49
lines changed

4 files changed

+41
-49
lines changed

‎app/eventyay/static/eventyay-common/js/ui/popover.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $(function () {
7474
7575
<div class="profile-menu separator"></div>
7676
77-
<div class="profile-menu">
77+
<div class="profile-menu border-top">
7878
<a href="${basePath}${accountPath}" target="_self" class="btn btn-outline-success">
7979
<i class="fa fa-user-circle"></i> ${window.gettext('Account')}
8080
</a>

‎app/eventyay/static/pretixcontrol/js/ui/popover.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ $(function () {
6767
</a>
6868
</div>
6969
<div class="profile-menu separator"></div>
70-
<div class="profile-menu">
70+
<div class="profile-menu border-top">
7171
<a href="${basePath}${accountPath}" target="_self" class="btn btn-outline-success">
7272
<i class="fa fa-user-circle"></i> ${window.gettext('Account')}
7373
</a>

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

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -858,14 +858,14 @@ h1 .label {
858858
font-size: 14px;
859859
font-weight: normal;
860860
cursor: pointer;
861-
padding: 7px 16px;
861+
padding: 8px 16px;
862862
line-height: 1.5;
863863
a {
864-
color: darken($btn-primary-bg, 10%) !important;
865-
padding: 0 !important;
866-
border: none !important;
867-
background: none !important;
868-
display: inline !important;
864+
color: darken($btn-primary-bg, 10%);
865+
padding: 0;
866+
border: none;
867+
background: none;
868+
display: inline;
869869
line-height: 1.5;
870870
}
871871
.dashboard-item {
@@ -879,23 +879,19 @@ h1 .label {
879879
vertical-align: middle;
880880
}
881881
&.separator {
882-
height: 0;
883-
background-color: transparent;
884-
margin: 0;
885-
padding: 0;
886882
display: none;
887883
}
888884
}
889-
.profile-menu:nth-child(6),
885+
.profile-menu.border-top,
890886
.profile-menu.admin,
891887
.profile-menu:last-child {
892888
border-top: 1px solid #d1d5db;
893889
}
894890
.profile-menu:hover {
895891
color: #fff;
896-
background-color: darken($btn-primary-bg, 10%) !important;
892+
background-color: darken($btn-primary-bg, 10%);
897893
a {
898-
color: #fff !important;
894+
color: #fff;
899895
}
900896
}
901897
.dashboard-item {
@@ -920,31 +916,31 @@ h1 .label {
920916

921917
.submenu-item {
922918
background-color: #fff;
923-
padding: 7px 16px;
919+
padding: 8px 16px;
924920
font-size: 12px;
925921
line-height: 1.5;
926922

927923
a {
928-
color: darken($btn-primary-bg, 10%) !important;
929-
padding: 0 !important;
930-
border: none !important;
931-
background: none !important;
932-
display: inline !important;
924+
color: darken($btn-primary-bg, 10%);
925+
padding: 0;
926+
border: none;
927+
background: none;
928+
display: inline;
933929
line-height: 1.5;
934930
}
935931

936932
i {
937-
margin-right: 7px;
933+
margin-right: 8px;
938934
width: 12px;
939935
font-size: 12px;
940936
vertical-align: middle;
941937
}
942938

943939
&:hover {
944-
background-color: darken($btn-primary-bg, 10%) !important;
940+
background-color: darken($btn-primary-bg, 10%);
945941

946942
a {
947-
color: #fff !important;
943+
color: #fff;
948944
}
949945
}
950946
}
@@ -960,11 +956,11 @@ h1 .label {
960956
line-height: 1.5;
961957

962958
a {
963-
color: darken($btn-primary-bg, 10%) !important;
964-
padding: 0 !important;
965-
border: none !important;
966-
background: none !important;
967-
display: inline !important;
959+
color: darken($btn-primary-bg, 10%);
960+
padding: 0;
961+
border: none;
962+
background: none;
963+
display: inline;
968964
line-height: 1.5;
969965
}
970966

@@ -977,23 +973,23 @@ h1 .label {
977973
}
978974

979975
&:hover {
980-
background-color: darken($btn-primary-bg, 10%) !important;
976+
background-color: darken($btn-primary-bg, 10%);
981977

982978
a {
983-
color: #fff !important;
979+
color: #fff;
984980
}
985981
}
986982
}
987983
}
988984
}
989985
}
990986
.dashboard-item:hover {
991-
color: #fff !important;
992-
background-color: darken($btn-primary-bg, 10%) !important;
987+
color: #fff;
988+
background-color: darken($btn-primary-bg, 10%);
993989
}
994990
.dashboard-content:hover {
995-
color: #fff !important;
996-
background-color: darken($btn-primary-bg, 10%) !important;
991+
color: #fff;
992+
background-color: darken($btn-primary-bg, 10%);
997993
}
998994
}
999995

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -94,42 +94,38 @@ $body-bg: #f5f5f5 !default;
9494
font-size: 14px;
9595
font-weight: normal;
9696
cursor: pointer;
97-
padding: 7px 16px;
97+
padding: 8px 16px;
9898
line-height: 1.5;
9999
a {
100-
color: darken($btn-primary-bg, 10%) !important;
101-
padding: 0 !important;
102-
border: none !important;
103-
background: none !important;
104-
display: inline !important;
100+
color: darken($btn-primary-bg, 10%);
101+
padding: 0;
102+
border: none;
103+
background: none;
104+
display: inline;
105105
line-height: 1.5;
106106
}
107107
i {
108-
margin-right: 7px;
108+
margin-right: 8px;
109109
width: 12px;
110110
text-align: center;
111111
font-size: 12px;
112112
display: inline-block;
113113
vertical-align: middle;
114114
}
115115
&.separator {
116-
height: 0;
117-
background-color: transparent;
118-
margin: 0;
119-
padding: 0;
120116
display: none;
121117
}
122118
}
123-
.profile-menu:nth-child(4),
119+
.profile-menu.border-top,
124120
.profile-menu.admin,
125121
.profile-menu:last-child {
126122
border-top: 1px solid #d1d5db;
127123
}
128124
.profile-menu:hover {
129125
color: #fff;
130-
background-color: darken($btn-primary-bg, 10%) !important;
126+
background-color: darken($btn-primary-bg, 10%);
131127
a {
132-
color: #fff !important;
128+
color: #fff;
133129
}
134130
}
135131
}

0 commit comments

Comments
 (0)