Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #27 from sanjivj/master
Changed class="span*" to class="col-md-*"
  • Loading branch information
renyi committed Sep 25, 2015
2 parents e45c92d + 4dbf84e commit 1b117c1
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 77 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
*.pyc
*sublime*
gnuTheme
bo*/
141 changes: 76 additions & 65 deletions mezzanine_themes/business/templates/base.html
Expand Up @@ -46,83 +46,94 @@

</head>
<body id="{% block body_id %}body{% endblock %}">

<div id="header" class="container">
<div id="wrapper" class="container">
<div class="row">
<div id="site-info" class="span6">
<div id="site-logo"><a href="/"><img src="{{ STATIC_URL }}img/logo.png" /></a></div>
<div id="site-titles">
{% if settings.SITE_TITLE %}<div id="site-title"><a href="/">{{ settings.SITE_TITLE }}</a></div>{% endif %}
{% if settings.SITE_TAGLINE %}<div id="site-tagline">{{ settings.SITE_TAGLINE }}</div>{% endif %}
<div class="col-md-2"></div>

<div class="col-md-8">
<div id="header" class="container">
<div class="row">
<div id="site-info" class="col-md-6">
<div id="site-logo"><a href="/"><img src="{{ STATIC_URL }}img/logo.png" /></a></div>
<div id="site-titles">
{% if settings.SITE_TITLE %}<div id="site-title"><a href="/">{{ settings.SITE_TITLE }}</a></div>{% endif %}
{% if settings.SITE_TAGLINE %}<div id="site-tagline">{{ settings.SITE_TAGLINE }}</div>{% endif %}
</div>
</div>
<div id="navigation" class="col-md-6">
{% page_menu "pages/menus/dropdown.html" %}
</div>
</div>
<div id="navigation" class="span6">
{% page_menu "pages/menus/dropdown.html" %}
</div>
</div>
</div>

<div id="main" class="container">

{% nevercache %}
{% for message in messages %}
<div class="alert alert-{{ message.tags }}" data-alert="alert">
<a class="close" href="#" onclick="$(this).parent().fadeOut('fast'); return false;">×</a>{{ message }}
</div>
{% endfor %}
{% endnevercache %}

{% block full %}
<div class="row">

<div class="span9 middle">

<ul class="breadcrumb-custom">
{% spaceless %}
{% block breadcrumb_menu %}{% page_menu "pages/menus/breadcrumb.html" %}{% endblock %}
{% endspaceless %}
</ul>

<h1>{% block title %}{% endblock %}</h1>

{% block main %}{% endblock %}

<div id="main" class="container">

{% nevercache %}
{% for message in messages %}
<div class="alert alert-{{ message.tags }}" data-alert="alert">
<a class="close" href="#" onclick="$(this).parent().fadeOut('fast'); return false;">×</a>{{ message }}
</div>

<div class="span3 right">

<div class="panel">
{% block right_panel %}
{% ifinstalled mezzanine.twitter %}
{% include "twitter/tweets.html" %}
{% endifinstalled %}
{% endblock %}
{% endfor %}
{% endnevercache %}

{% block full %}
<div class="row">

<div class="col-md-9 middle">

<ul class="breadcrumb-custom">
{% spaceless %}
{% block breadcrumb_menu %}{% page_menu "pages/menus/breadcrumb.html" %}{% endblock %}
{% endspaceless %}
</ul>

<h1>{% block title %}{% endblock %}</h1>

{% block main %}{% endblock %}

</div>


<div class="col-md-3 right">

<div class="panel">
{% block right_panel %}
{% ifinstalled mezzanine.twitter %}
{% include "twitter/tweets.html" %}
{% endifinstalled %}
{% endblock %}
</div>

</div>

</div><!-- /row -->
{% endblock %}

</div><!-- /container #main -->

<div id="footer-line" class="container">
<div class="row">
<div class="col-md-6">
{% include "includes/footer_text.html" %}
</div>
<div id="footer-powered" class="col-md-6">
{% include "includes/footer_powered.html" %}
<a onclick="scrollToTop();return false;" href="#"><i class="icon-arrow-up"></i></a>
</div>
</div>

</div><!-- /row -->
{% endblock %}

</div><!-- /container #main -->

<div id="footer-line" class="container">
<div class="row">
<div class="span6">
{% include "includes/footer_text.html" %}
</div>
<div id="footer-powered" class="span6">
{% include "includes/footer_powered.html" %}
<a onclick="scrollToTop();return false;" href="#"><i class="icon-arrow-up"></i></a>

<div id="footer" class="container">
{% page_menu "pages/menus/footer.html" %}
</div>

</div>
</div>

<div id="footer" class="container">
{% page_menu "pages/menus/footer.html" %}
</div>


</div>

{% include "includes/footer_scripts.html" %}
<div class="col-md-2"></div>
</div>

</body>
</html>
10 changes: 5 additions & 5 deletions mezzanine_themes/business/templates/index.html
Expand Up @@ -19,7 +19,7 @@
{% block full %}
<div id="topblock" class="row">

<div id="toptext" class="span6 left">
<div id="toptext" class="col-md-6 left">

<h1>{% trans "Best company slogan is here!" %}</h1>
<ul id="toplist">
Expand All @@ -31,27 +31,27 @@ <h1>{% trans "Best company slogan is here!" %}</h1>

</div>

<div class="span6 right">
<div class="col-md-6 right">
<img class="thumbnail" src="http://ipsumimage.appspot.com/440x240" />
</div>

</div><!-- /row -->

<div class="row">

<div class="span4">
<div class="col-md-4">

<h2>Topic</h2>
<p>Aliquam aliquam laoreet eleifend. Nulla ac risus sed nisi rutrum facilisis. Nulla pharetra leo egestas felis porttitor ornare id at sem. Praesent vitae lorem erat, posuere iaculis dolor. Maecenas adipiscing lectus sit amet tellus lacinia nec blandit libero dignissim.</p>

</div>
<div class="span4">
<div class="col-md-4">

<h2>Topic</h2>
<p>Lorem ipsum dolor sit amet, consectetur <strong>adipiscing</strong> elit. Ut interdum ultrices odio non ornare. Fusce vehicula sem sed neque porttitor pretium. Duis hendrerit nibh id dui mattis euismod. Nulla rhoncus <em>nibh pharetra</em> sem convallis tincidunt.</p>

</div>
<div class="span4">
<div class="col-md-4">

<h2>Topic</h2>
<p>Aliquam aliquam laoreet eleifend. Nulla ac risus sed nisi rutrum facilisis. Nulla pharetra leo egestas felis porttitor ornare id at sem. Praesent vitae lorem erat, posuere iaculis dolor. Maecenas adipiscing lectus sit amet tellus lacinia nec blandit libero dignissim.</p>
Expand Down
12 changes: 6 additions & 6 deletions mezzanine_themes/classic/templates/base.html
Expand Up @@ -49,14 +49,14 @@

<div id="header" class="container">
<div class="row">
<div id="site-info" class="span6">
<div id="site-info" class="col-md-6">
<div id="site-logo"><a href="/"><img src="{{ STATIC_URL }}img/logo.png" /></a></div>
<div id="site-titles">
{% if settings.SITE_TITLE %}<div id="site-title"><a href="/">{{ settings.SITE_TITLE }}</a></div>{% endif %}
{% if settings.SITE_TAGLINE %}<div id="site-tagline">{{ settings.SITE_TAGLINE }}</div>{% endif %}
</div>
</div>
<div id="user-info" class="span6">
<div id="user-info" class="col-md-6">
{% nevercache %}
{% include "includes/user_panel.html" %}
{% endnevercache %}
Expand Down Expand Up @@ -85,7 +85,7 @@
{% block full %}
<div class="row">

<div class="span9 middle">
<div class="col-md-9 middle">

<ul class="breadcrumb-custom">
{% spaceless %}
Expand All @@ -99,7 +99,7 @@ <h1>{% block title %}{% endblock %}</h1>

</div>

<div class="span3 right">
<div class="col-md-3 right">

<div class="panel">
{% block right_panel %}
Expand All @@ -118,10 +118,10 @@ <h1>{% block title %}{% endblock %}</h1>

<div id="footer-line" class="container">
<div class="row">
<div class="span6">
<div class="col-md-6">
{% include "includes/footer_text.html" %}
</div>
<div id="footer-powered" class="span6">
<div id="footer-powered" class="col-md-6">
{% include "includes/footer_powered.html" %}
<a onclick="scrollToTop();return false;" href="#"><i class="icon-arrow-up"></i></a>
</div>
Expand Down
@@ -1,4 +1,4 @@
{% load mezzanine_tags i18n include_strip future %}
{% load mezzanine_tags i18n future %}
<div id="user-welcome">
{% spaceless %}
{% trans "Welcome" %}{% ifinstalled mezzanine.accounts %},
Expand Down

0 comments on commit 1b117c1

Please sign in to comment.