Commit d0819e01 authored by olijones's avatar olijones
Browse files

pull #2

parents fd90a6cb bf8d28d8
......@@ -266,9 +266,12 @@ th {
src: url('../fonts/glyphicons-halflings-regular.eot');
src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
}
<<<<<<< HEAD
.glyphlink {
color: #428bca;
}
=======
>>>>>>> FETCH_HEAD
.glyphicon {
position: relative;
top: 1px;
......@@ -1225,7 +1228,10 @@ ul,
ol {
margin-top: 0;
margin-bottom: 10px;
<<<<<<< HEAD
font-weight: 600;
=======
>>>>>>> FETCH_HEAD
}
ul ul,
ol ul,
......@@ -4994,6 +5000,7 @@ a.list-group-item-danger.active:focus {
margin-bottom: 0;
line-height: 1.3;
}
<<<<<<< HEAD
.accordian {
border-radius: 3px;
background-color: #fff;
......@@ -5007,6 +5014,11 @@ a.list-group-item-danger.active:focus {
}
.panel {
border-radius: 3px;
=======
.panel {
border-radius: 3px;
padding-top: 10px;
>>>>>>> FETCH_HEAD
margin-bottom: 20px;
background-color: #fff;
border-bottom: 3px solid #dfdfdd;
......@@ -5016,6 +5028,7 @@ a.list-group-item-danger.active:focus {
padding-bottom: 20px;
}
.panel-heading {
<<<<<<< HEAD
padding: 20px 15px;
margin-bottom: 20px;
border-bottom: 1px solid transparent;
......@@ -5027,6 +5040,13 @@ a.list-group-item-danger.active:focus {
color: #fff;
margin-bottom: 0px;
}
=======
padding: 10px 15px;
border-bottom: 1px solid transparent;
border-top-left-radius: 3px;
border-top-right-radius: 3px;
}
>>>>>>> FETCH_HEAD
.panel-heading > .dropdown .dropdown-toggle {
color: inherit;
}
......
......@@ -102,11 +102,14 @@ summary
.right
{
<<<<<<< HEAD
text-align: right;
}
.floatright
{
=======
>>>>>>> FETCH_HEAD
float: right;
margin-top: 55px;
}
......@@ -116,6 +119,7 @@ summary
margin-bottom: 50px;
}
<<<<<<< HEAD
.paragraphlist {
margin-bottom: 30px;
}
......@@ -137,6 +141,8 @@ hr {
padding-right: 20px;
}
=======
>>>>>>> FETCH_HEAD
#main
{
padding-bottom: 100px;
......@@ -275,7 +281,15 @@ a.linkedin
margin: 0 auto;
display: block;
}
<<<<<<< HEAD
=======
#homePage #main .row p
{
margin-bottom: 30px;
}
>>>>>>> FETCH_HEAD
/* Blog */
.blogSummary
......
......@@ -191,9 +191,12 @@ input[type=submit]
{
font-size: 26px;
}
<<<<<<< HEAD
.pedigogicalicon
{
height: 26px;
margin-top: 0px !important;
}
=======
>>>>>>> FETCH_HEAD
}
\ No newline at end of file
......@@ -11,7 +11,10 @@
<link rel="stylesheet" type="text/css" href="css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="css/layout.css">
<link rel="stylesheet" type="text/css" href="css/typography.css">
<<<<<<< HEAD
<link rel="shortcut icon" href="images/favicon.png">
=======
>>>>>>> FETCH_HEAD
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
......@@ -33,7 +36,11 @@
<h1>
<a class="brand" href="index.html"><img src="images/OERu-logo.png" alt="Open Education Resources university"></a>
</h1>
<<<<<<< HEAD
<div class="brand floatright">
=======
<div class="brand right">
>>>>>>> FETCH_HEAD
<h3>OCL4Ed</h3>
</div>
</div>
......@@ -54,8 +61,13 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Startup<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<li><a href="starthere.html">Start Here</a></li>
<<<<<<< HEAD
<li><a href="registration.html">Registration</a></li>
<li><a href="about.html">About</a></li>
=======
<li><a href="#">Registration</a></li>
<li><a href="#">About</a></li>
>>>>>>> FETCH_HEAD
</ul>
</li>
<li class="dropdown">
......@@ -195,8 +207,13 @@
<div class="row">
<div class="col-md-12">
<ul class="pager">
<<<<<<< HEAD
<li class="previous"><a href="#">&larr; Previous</a></li>
<li class="next"><a href="starthere.html">Next &rarr;</a></li>
=======
<li class="previous"><a href="#">&larr; Older</a></li>
<li class="next"><a href="#">Newer &rarr;</a></li>
>>>>>>> FETCH_HEAD
</ul>
</div>
</div>
......
......@@ -11,7 +11,10 @@
<link rel="stylesheet" type="text/css" href="css/bootstrap.css">
<link rel="stylesheet" type="text/css" href="css/layout.css">
<link rel="stylesheet" type="text/css" href="css/typography.css">
<<<<<<< HEAD
<link rel="shortcut icon" href="images/favicon.png">
=======
>>>>>>> FETCH_HEAD
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
......@@ -33,7 +36,11 @@
<h1>
<a class="brand" href="index.html"><img src="images/OERu-logo.png" alt="Open Education Resources university"></a>
</h1>
<<<<<<< HEAD
<div class="brand floatright">
=======
<div class="brand right">
>>>>>>> FETCH_HEAD
<h3>OCL4Ed</h3>
</div>
</div>
......@@ -53,9 +60,15 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Startup<span class="caret"></span></a>
<ul class="dropdown-menu" role="menu">
<<<<<<< HEAD
<li class="current"><a href="starthere.html">Start Here</a></li>
<li><a href="registration.html">Registration</a></li>
<li><a href="about.html">About</a></li>
=======
<li class="current"><a href="#">Start Here</a></li>
<li><a href="#">Registration</a></li>
<li><a href="#">About</a></li>
>>>>>>> FETCH_HEAD
</ul>
</li>
<li class="dropdown">
......@@ -131,6 +144,7 @@
<div class="panel-body">
<div class="col-xs-12 col-sm-6 col-md-8">
<h3>4 things you should do before starting the course</h3>
<<<<<<< HEAD
<ol>
<li class="paragraphlist">
<p><a href="#"><span style="font-weight: 700;">Register</span></a> for the course if you want to receive course announcements via email. If you have an account on the WikiEducator website you can use these login credentials. If not, you should click on the "create an account" link and follow the instructions on screen. Note that registration is also required to participate in peer evaluations and keeping track of your activity if you're interested in certification for participation in this course.</p>
......@@ -150,6 +164,12 @@
<p><span style="font-weight: 700;">Complete</span> the optional <a href="#">OERu new participant survey</a>.</p>
</li>
</ol>
=======
<p><span style="font-weight: 700;">Step 1:</span> Register to receive course announcements via email. We recommend that you register selected social media accounts to interact with fellow learners using your own preferred tools. If you are planning to consider certification for participation, you should register these accounts <span style="font-weight: 700;">before</span> you start the course. You can also <a href="#">update</a> your links or unsubscribe from the registration page.</p>
<div class="button">
<a href="#">Register</a>
</div>
>>>>>>> FETCH_HEAD
</div>
<div class="col-xs-12 col-sm-6 col-md-4">
<img src="images/One_Canada_Square,_Canary_Wharf.jpg" alt="oeru courses">
......@@ -159,6 +179,7 @@
</div>
</div>
<<<<<<< HEAD
<div class="row">
<div class="col-md-12">
<div class="panel">
......@@ -283,13 +304,20 @@
</div>
</div>
</div>
=======
>>>>>>> FETCH_HEAD
<div class="row">
<div class="col-md-12">
<ul class="pager">
<<<<<<< HEAD
<li class="previous"><a href="index.html">&larr; Previous</a></li>
<li class="next"><a href="registration.html">Next &rarr;</a></li>
=======
<li class="previous"><a href="#">&larr; Older</a></li>
<li class="next"><a href="#">Newer &rarr;</a></li>
>>>>>>> FETCH_HEAD
</ul>
</div>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment