Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit f9e3099

Browse files
author
Parth Shah
committed
Merge branch 'feature/page-header-directive-2' into dev
2 parents d77df9c + 6ef178c commit f9e3099

File tree

5 files changed

+86
-79
lines changed

5 files changed

+86
-79
lines changed

‎app/directives/page-state-header/page-state-header.directive.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
header
33
.page-info
44
h1 {{pageTitle}}
5+
div(ng-transclude)
56
.info
67
.pic
78
a(ui-sref="profile.about({userHandle: vm.profile.handle})")

‎app/directives/page-state-header/page-state-header.directive.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
return {
66
restrict: 'E',
77
templateUrl: 'directives/page-state-header/page-state-header.directive.html',
8+
transclude: true,
89
scope: {
910
handle: '@',
1011
pageTitle: '@',

‎app/profile/subtrack/subtrack.jade

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
.profile-subtrack-container(ng-cloak, ng-show="profileVm.status.stats === 'ready'")
22
.content
3-
43
.page-header
54
page-state-header(handle="{{vm.userHandle}}", page-title="{{vm.pageName}}", hide-money="true", show-back-link="true", default-state="dashboard")
6-
5+
.nav-right
6+
i.fa.fa-th(ng-click="vm.showNav()")
77
tc-tab-set
88
tc-tab(heading="{{vm.tabs[0]}}")
99
.subtrack-stats

‎assets/css/directives/page-state-header.directive.scss

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@
9898
align-items: center;
9999
justify-content: space-between;
100100

101-
102101
.page-info {
103102
order: 2;
103+
display: flex;
104+
flex-direction: row;
104105
h1 {
105106
font-size: 36px;
106107
line-height: 43px;
@@ -112,4 +113,4 @@
112113
}
113114
}
114115
}
115-
}
116+
}

‎assets/css/profile/subtrack.scss

Lines changed: 79 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -12,83 +12,87 @@
1212

1313
margin: 30px auto 40px;
1414

15-
16-
.nav {
17-
@include module-full-width;
18-
width: 100%;
19-
// max-width: 1242px;
20-
// background: white;
21-
height: 100px;
22-
// margin: 30px auto 40px;
23-
// margin-right: auto;
24-
display: flex;
25-
flex-direction: row;
26-
justify-content: space-between;
27-
align-items: center;
28-
// margin-bottom: 10px;
29-
30-
.right {
31-
width: 15px;
32-
margin-right: 50px;
33-
.subtrack {
34-
display: block;
35-
color: $primary;
36-
font-weight: 700;
37-
text-align: center;
38-
text-transform: uppercase;
39-
}
40-
41-
i {
42-
color: #a3a3ae;
43-
font-size: 19px;
44-
cursor: pointer;
45-
&:hover {
46-
color: black;
47-
}
48-
}
15+
.nav-right {
16+
padding-top: 15px;
17+
padding-left: 15px;
4918
}
19+
// .nav {
20+
// @include module-full-width;
21+
// width: 100%;
22+
// // max-width: 1242px;
23+
// // background: white;
24+
// height: 100px;
25+
// // margin: 30px auto 40px;
26+
// // margin-right: auto;
27+
// display: flex;
28+
// flex-direction: row;
29+
// justify-content: space-between;
30+
// align-items: center;
31+
// // margin-bottom: 10px;
32+
33+
// .right {
34+
// width: 15px;
35+
// margin-right: 50px;
36+
// .subtrack {
37+
// display: block;
38+
// color: $primary;
39+
// font-weight: 700;
40+
// text-align: center;
41+
// text-transform: uppercase;
42+
// }
43+
44+
// i {
45+
// color: #a3a3ae;
46+
// font-size: 19px;
47+
// cursor: pointer;
48+
// &:hover {
49+
// color: black;
50+
// }
51+
// }
52+
// }
53+
54+
// .handle {
55+
// a {
56+
// &:hover {
57+
// color: $primary;
58+
// }
59+
// }
60+
// }
61+
62+
63+
// }
64+
// .tabs {
65+
// background-color: $gray-lightest;
66+
// display: flex;
67+
// height: 60px;
68+
// flex-direction: row;
69+
// justify-content: center;
70+
// padding-top: 20px;
71+
// padding-bottom: 16px;
72+
// border-top: 1px solid $gray-light;
73+
// border-bottom: 1px solid $gray-light;
74+
// a {
75+
// color: #a3a3ae;
76+
// width: 140px;
77+
// height: 30px;
78+
// // padding-top: 6px;
79+
// text-align: center;
80+
// @include sofia-pro-medium;
81+
// font-size: 18px;
82+
// line-height: 24px;
83+
// text-transform: uppercase;
84+
// &.left {
85+
// }
86+
// &.right {
87+
// }
88+
// &.selected {
89+
// color: $gray-darkest;
90+
// padding-bottom: 36px;
91+
// border-bottom: solid 2px $primary;
92+
// }
93+
// }
94+
// }
5095

51-
.handle {
52-
a {
53-
&:hover {
54-
color: $primary;
55-
}
56-
}
57-
}
58-
59-
60-
}
61-
.tabs {
62-
background-color: $gray-lightest;
63-
display: flex;
64-
height: 60px;
65-
flex-direction: row;
66-
justify-content: center;
67-
padding-top: 20px;
68-
padding-bottom: 16px;
69-
border-top: 1px solid $gray-light;
70-
border-bottom: 1px solid $gray-light;
71-
a {
72-
color: #a3a3ae;
73-
width: 140px;
74-
height: 30px;
75-
// padding-top: 6px;
76-
text-align: center;
77-
@include sofia-pro-medium;
78-
font-size: 18px;
79-
line-height: 24px;
80-
text-transform: uppercase;
81-
&.left {
82-
}
83-
&.right {
84-
}
85-
&.selected {
86-
color: $gray-darkest;
87-
padding-bottom: 36px;
88-
border-bottom: solid 2px $primary;
89-
}
90-
}
91-
}
9296
.subtrack-stats {
9397
// @include module-l;
9498
width: 100%;

0 commit comments

Comments
 (0)