Skip to content

Commit 6bdaecd

Browse files
Aqil-AhmadAqil-Ahmad
committed
resolve comments
1 parent 0f4954c commit 6bdaecd

File tree

5 files changed

+42
-50
lines changed

5 files changed

+42
-50
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
@@ -68,7 +68,7 @@ $(function () {
6868
6969
<div class="profile-menu separator"></div>
7070
71-
<div class="profile-menu">
71+
<div class="profile-menu border-top">
7272
<a href="${basePath}${accountPath}" target="_self" class="btn btn-outline-success">
7373
<i class="fa fa-user-circle"></i> ${window.gettext('Account')}
7474
</a>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ $(function () {
6161
</a>
6262
</div>
6363
<div class="profile-menu separator"></div>
64-
<div class="profile-menu">
64+
<div class="profile-menu border-top">
6565
<a href="${basePath}${accountPath}" target="_self" class="btn btn-outline-success">
6666
<i class="fa fa-user-circle"></i> ${window.gettext('Account')}
6767
</a>

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

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -763,14 +763,14 @@ h1 .label {
763763
font-size: 14px;
764764
font-weight: normal;
765765
cursor: pointer;
766-
padding: 7px 16px;
766+
padding: 8px 16px;
767767
line-height: 1.5;
768768
a {
769-
color: darken($btn-primary-bg, 10%) !important;
770-
padding: 0 !important;
771-
border: none !important;
772-
background: none !important;
773-
display: inline !important;
769+
color: darken($btn-primary-bg, 10%);
770+
padding: 0;
771+
border: none;
772+
background: none;
773+
display: inline;
774774
line-height: 1.5;
775775
}
776776
.dashboard-item {
@@ -784,23 +784,19 @@ h1 .label {
784784
vertical-align: middle;
785785
}
786786
&.separator {
787-
height: 0;
788-
background-color: transparent;
789-
margin: 0;
790-
padding: 0;
791787
display: none;
792788
}
793789
}
794-
.profile-menu:nth-child(6),
790+
.profile-menu.border-top,
795791
.profile-menu.admin,
796792
.profile-menu:last-child {
797793
border-top: 1px solid #d1d5db;
798794
}
799795
.profile-menu:hover {
800796
color: #fff;
801-
background-color: darken($btn-primary-bg, 10%) !important;
797+
background-color: darken($btn-primary-bg, 10%);
802798
a {
803-
color: #fff !important;
799+
color: #fff;
804800
}
805801
}
806802
.dashboard-item {
@@ -825,31 +821,31 @@ h1 .label {
825821

826822
.submenu-item {
827823
background-color: #fff;
828-
padding: 7px 16px;
824+
padding: 8px 16px;
829825
font-size: 12px;
830826
line-height: 1.5;
831827

832828
a {
833-
color: darken($btn-primary-bg, 10%) !important;
834-
padding: 0 !important;
835-
border: none !important;
836-
background: none !important;
837-
display: inline !important;
829+
color: darken($btn-primary-bg, 10%);
830+
padding: 0;
831+
border: none;
832+
background: none;
833+
display: inline;
838834
line-height: 1.5;
839835
}
840836

841837
i {
842-
margin-right: 7px;
838+
margin-right: 8px;
843839
width: 12px;
844840
font-size: 12px;
845841
vertical-align: middle;
846842
}
847843

848844
&:hover {
849-
background-color: darken($btn-primary-bg, 10%) !important;
845+
background-color: darken($btn-primary-bg, 10%);
850846

851847
a {
852-
color: #fff !important;
848+
color: #fff;
853849
}
854850
}
855851
}
@@ -865,11 +861,11 @@ h1 .label {
865861
line-height: 1.5;
866862

867863
a {
868-
color: darken($btn-primary-bg, 10%) !important;
869-
padding: 0 !important;
870-
border: none !important;
871-
background: none !important;
872-
display: inline !important;
864+
color: darken($btn-primary-bg, 10%);
865+
padding: 0;
866+
border: none;
867+
background: none;
868+
display: inline;
873869
line-height: 1.5;
874870
}
875871

@@ -882,23 +878,23 @@ h1 .label {
882878
}
883879

884880
&:hover {
885-
background-color: darken($btn-primary-bg, 10%) !important;
881+
background-color: darken($btn-primary-bg, 10%);
886882

887883
a {
888-
color: #fff !important;
884+
color: #fff;
889885
}
890886
}
891887
}
892888
}
893889
}
894890
}
895891
.dashboard-item:hover {
896-
color: #fff !important;
897-
background-color: darken($btn-primary-bg, 10%) !important;
892+
color: #fff;
893+
background-color: darken($btn-primary-bg, 10%);
898894
}
899895
.dashboard-content:hover {
900-
color: #fff !important;
901-
background-color: darken($btn-primary-bg, 10%) !important;
896+
color: #fff;
897+
background-color: darken($btn-primary-bg, 10%);
902898
}
903899
}
904900

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ $(function () {
5252
<i class="fa fa-shopping-cart"></i> ${window.gettext('My Orders')}
5353
</a>
5454
</div>
55-
<div class="profile-menu">
55+
<div class="profile-menu border-top">
5656
<a href="${basePath}${profilePath}" target="_self" class="btn btn-outline-success">
5757
<i class="fa fa-user"></i> ${window.gettext('My Account')}
5858
</a>

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

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,42 +81,38 @@ footer nav {
8181
font-size: 14px;
8282
font-weight: normal;
8383
cursor: pointer;
84-
padding: 7px 16px;
84+
padding: 8px 16px;
8585
line-height: 1.5;
8686
a {
87-
color: darken($btn-primary-bg, 10%) !important;
88-
padding: 0 !important;
89-
border: none !important;
90-
background: none !important;
91-
display: inline !important;
87+
color: darken($btn-primary-bg, 10%);
88+
padding: 0;
89+
border: none;
90+
background: none;
91+
display: inline;
9292
line-height: 1.5;
9393
}
9494
i {
95-
margin-right: 7px;
95+
margin-right: 8px;
9696
width: 12px;
9797
text-align: center;
9898
font-size: 12px;
9999
display: inline-block;
100100
vertical-align: middle;
101101
}
102102
&.separator {
103-
height: 0;
104-
background-color: transparent;
105-
margin: 0;
106-
padding: 0;
107103
display: none;
108104
}
109105
}
110-
.profile-menu:nth-child(4),
106+
.profile-menu.border-top,
111107
.profile-menu.admin,
112108
.profile-menu:last-child {
113109
border-top: 1px solid #d1d5db;
114110
}
115111
.profile-menu:hover {
116112
color: #fff;
117-
background-color: darken($btn-primary-bg, 10%) !important;
113+
background-color: darken($btn-primary-bg, 10%);
118114
a {
119-
color: #fff !important;
115+
color: #fff;
120116
}
121117
}
122118
}

0 commit comments

Comments
 (0)