Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
41fa73b6
Commit
41fa73b6
authored
Jul 01, 2013
by
Brian Talbot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
studio - wraps nav elements in floated containers for easier layout
parent
beaa5979
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
53 additions
and
28 deletions
+53
-28
cms/static/sass/elements/_header.scss
+53
-28
cms/templates/widgets/header.html
+0
-0
No files found.
cms/static/sass/elements/_header.scss
View file @
41fa73b6
...
@@ -22,6 +22,23 @@
...
@@ -22,6 +22,23 @@
// ====================
// ====================
// basic layout
// basic layout
.wrapper-l
,
.wrapper-r
{
background
:
$white
;
}
.wrapper-l
{
float
:
left
;
margin-right
:
flex-gutter
();
width
:
flex-grid
(
7
,
12
);
}
.wrapper-r
{
float
:
right
;
width
:
flex-grid
(
4
,
12
);
text-align
:
right
;
}
.branding
,
.info-course
,
.nav-course
,
.nav-account
,
.nav-pitch
{
.branding
,
.info-course
,
.nav-course
,
.nav-account
,
.nav-pitch
{
@include
box-sizing
(
border-box
);
@include
box-sizing
(
border-box
);
display
:
inline-block
;
display
:
inline-block
;
...
@@ -29,13 +46,6 @@
...
@@ -29,13 +46,6 @@
}
}
// basic layout - nav items
// basic layout - nav items
.nav-item
{
.title
{
}
}
nav
{
nav
{
>
ol
>
.nav-item
{
>
ol
>
.nav-item
{
...
@@ -116,9 +126,9 @@
...
@@ -116,9 +126,9 @@
// specific elements - course name/info
// specific elements - course name/info
.info-course
{
.info-course
{
margin-right
:
(
$baseline
*
0
.75
);
margin-right
:
flex-gutter
(
);
border-right
:
1px
solid
$gray-l4
;
border-right
:
1px
solid
$gray-l4
;
padding
:
(
$baseline
*
0
.75
)
$baseline
(
$baseline
*
0
.75
)
0
;
padding
:
(
$baseline
*
0
.75
)
flex-gutter
()
(
$baseline
*
0
.75
)
0
;
.course-org
,
.course-number
{
.course-org
,
.course-number
{
@extend
.t-action4
;
@extend
.t-action4
;
...
@@ -169,7 +179,6 @@
...
@@ -169,7 +179,6 @@
.nav-account
{
.nav-account
{
position
:
relative
;
position
:
relative
;
padding
:
(
$baseline
*
0
.75
)
0
;
padding
:
(
$baseline
*
0
.75
)
0
;
text-align
:
right
;
.nav-sub
{
.nav-sub
{
text-align
:
left
;
text-align
:
left
;
...
@@ -199,7 +208,6 @@
...
@@ -199,7 +208,6 @@
.nav-pitch
{
.nav-pitch
{
position
:
relative
;
position
:
relative
;
padding
:
(
$baseline
*
0
.75
)
0
;
padding
:
(
$baseline
*
0
.75
)
0
;
text-align
:
right
;
.nav-sub
{
.nav-sub
{
text-align
:
left
;
text-align
:
left
;
...
@@ -212,16 +220,21 @@
...
@@ -212,16 +220,21 @@
// CASE: user signed in
// CASE: user signed in
.is-signedin
{
.is-signedin
{
.wrapper-header
{
.wrapper-l
{
width
:
flex-grid
(
9
,
12
);
}
.branding
{
.wrapper-r
{
width
:
15%
;
width
:
flex-grid
(
3
,
12
);
margin-right
:
2%
;
}
}
.nav-account
{
.branding
{
width
:
80%
;
width
:
20%
;
}
margin-right
:
2%
;
}
.nav-account
{
top
:
(
$baseline
/
4
);
}
}
}
}
...
@@ -232,21 +245,26 @@
...
@@ -232,21 +245,26 @@
.wrapper-header
{
.wrapper-header
{
.wrapper-l
{
width
:
flex-grid
(
9
,
12
);
}
.wrapper-r
{
width
:
flex-grid
(
3
,
12
);
}
.branding
{
.branding
{
width
:
15
%
;
width
:
20
%
;
margin-right
:
2%
;
margin-right
:
2%
;
}
}
.info-course
{
.info-course
{
width
:
25%
;
width
:
25%
;
margin-right
:
2%
;
}
}
.nav-course
{
.nav-course
{
width
:
34%
;
width
:
45%
;
}
.nav-account
{
width
:
20%
;
}
}
}
}
}
}
...
@@ -258,13 +276,20 @@
...
@@ -258,13 +276,20 @@
.wrapper-header
{
.wrapper-header
{
.wrapper-l
{
width
:
flex-grid
(
2
,
12
);
}
.wrapper-r
{
width
:
flex-grid
(
10
,
12
);
}
.branding
{
.branding
{
width
:
15%
;
width
:
100%
;
margin-right
:
2%
;
}
}
.nav-pitch
{
.nav-pitch
{
width
:
80%
;
top
:
(
$baseline
/
4
)
;
.nav-item
{
.nav-item
{
margin-right
:
(
$baseline
/
2
);
margin-right
:
(
$baseline
/
2
);
...
...
cms/templates/widgets/header.html
View file @
41fa73b6
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment