Permalink
Browse files

Responsive theme

Changed theme to responsive as per changed from srsgores/devel.
  • Loading branch information...
1 parent 98e36e5 commit b46b3803a357485b39479942399b5731b6fefe88 @richtera richtera committed Jan 5, 2013
Showing with 13,605 additions and 5,494 deletions.
  1. +1 −1 docs/coverage.html
  2. +1 −1 lib/client/Client.js
  3. +6 −8 lib/core/Form.js
  4. +3 −0 lib/core/Menu.js
  5. +1 −1 modules/core/admin/templates/install_user.html
  6. +2 −2 modules/core/assets/templates/list.html
  7. +4 −1 modules/core/assets/templates/show.html
  8. +5 −5 test/fixtures/themes/core/mocha/templates/default.html
  9. +132 −166 themes/core/cleanslate/public/css/admin-menu.css
  10. +1,839 −267 themes/core/cleanslate/public/css/admin.css
  11. +49 −89 themes/core/cleanslate/public/css/grids.css
  12. +252 −418 themes/core/cleanslate/public/css/install.css
  13. +59 −76 themes/core/cleanslate/public/css/media-queries.css
  14. +300 −0 themes/core/cleanslate/public/css/partials/icomoon/defs.css
  15. +57 −84 themes/core/cleanslate/public/css/primary-menu.css
  16. +1,715 −241 themes/core/cleanslate/public/css/style.css
  17. +1,174 −0 themes/core/cleanslate/public/fonts/icomoon/icomoon.dev.svg
  18. BIN themes/core/cleanslate/public/fonts/icomoon/icomoon.eot
  19. +1,174 −0 themes/core/cleanslate/public/fonts/icomoon/icomoon.svg
  20. BIN themes/core/cleanslate/public/fonts/icomoon/icomoon.ttf
  21. BIN themes/core/cleanslate/public/fonts/icomoon/icomoon.woff
  22. +45 −13 themes/core/cleanslate/public/js/cleanslate-core.js
  23. +0 −3,295 themes/core/cleanslate/public/js/jquery-1.7.2.min.js
  24. +3,104 −0 themes/core/cleanslate/public/js/jquery-1.8.2.min.js
  25. +324 −0 themes/core/cleanslate/public/js/lte-ie7.js
  26. +467 −0 themes/core/cleanslate/public/js/modernizr.custom.min.js
  27. +190 −0 themes/core/cleanslate/public/js/store.min.js
  28. +226 −150 themes/core/cleanslate/public/sass/admin-menu.scss
  29. +184 −191 themes/core/cleanslate/public/sass/admin.scss
  30. +6 −1 themes/core/cleanslate/public/sass/grids.scss
  31. +46 −11 themes/core/cleanslate/public/sass/media-queries.scss
  32. +1 −0 themes/core/cleanslate/public/sass/partials/icomoon/IcoMoon session.json
  33. +1,822 −0 themes/core/cleanslate/public/sass/partials/icomoon/_icomoon.scss
  34. +188 −186 themes/core/cleanslate/public/sass/primary-menu.scss
  35. +131 −213 themes/core/cleanslate/public/sass/style.scss
  36. +10 −3 themes/core/cleanslate/public/sass/variables.scss
  37. +13 −13 themes/core/cleanslate/templates/admin.html
  38. +28 −19 themes/core/cleanslate/templates/admin/body.html
  39. +7 −1 themes/core/cleanslate/templates/admin/scripts.html
  40. +25 −20 themes/core/cleanslate/templates/default.html
  41. +1 −1 themes/core/cleanslate/templates/default/adminMenu.html
  42. +0 −1 themes/core/cleanslate/templates/default/body.js
  43. +4 −3 themes/core/cleanslate/templates/default/scripts.html
  44. +1 −1 themes/core/cleanslate/templates/default/secondaryMenu.html
  45. +0 −1 themes/core/cleanslate/templates/default/secondaryMenu.js
  46. +8 −8 themes/core/cleanslate/templates/default/sidePanel.html
  47. +0 −1 themes/core/cleanslate/templates/default/sidePanel.js
  48. +0 −1 themes/core/cleanslate/templates/default/styles.js
  49. +0 −1 themes/core/cleanslate/templates/install/body.js
View
@@ -32629,7 +32629,7 @@
<tr>
<td class="line">29</td>
<td class="hits"></td>
- <td class="source"> 'jquery': {key:'jquery', url:'jquery-1.7.2.min.js', weight: -100},</td>
+ <td class="source"> 'jquery': {key:'jquery', url:'jquery-1.8.2.min.js', weight: -100},</td>
</tr>
<tr>
<td class="line">30</td>
View
@@ -26,7 +26,7 @@ var Client = module.exports = function Client(options) {
// Shortcuts to core, must be included somewhere (module or theme) to be rendered
this.coreScripts = {
- 'jquery':{key:'jquery', url:'jquery-1.7.2.min.js', weight:-100},
+ 'jquery':{key:'jquery', url:'jquery-1.8.2.min.js', weight:-100},
'calipso':{key:'calipso', url:'calipso.js', weight:-50}
}
View
@@ -233,7 +233,7 @@ me.decorateField = function (field, tagHTML) {
calipso.silly('FORM: decorateField, field: ', field);
var isCheckable = !field.labelFirst && (field.type == "checkbox" || field.type == "radio");
var labelHTML = field.label ? (
- '<label' + (isCheckable ? ' class="for-checkable"' : '')
+ '<label ' + (isCheckable ? ' class="for-checkable"' : '')
+ ' for="' + field.name + (field.type == 'radio' ? f.radioCount : '')
+ '">' + t(field.label) + (isCheckable ? '' : ':') + '</label>'
) : '';
@@ -245,7 +245,7 @@ me.decorateField = function (field, tagHTML) {
return field.label && field.label.length > 0 ? (
'<div class="form-item field-type-' + field.type + '" id="' + wrapperId + '-wrapper">' +
- '<div class="form-field">' +
+ '<div class="form-field row">' +
// put checkboxes and radios ("checkables") before their labels, unless field.labelFirst is true
(isCheckable ? tagHTML + labelHTML : labelHTML + tagHTML) +
'</div>' +
@@ -791,12 +791,10 @@ me.start_form = function (form) {
'<form id="' + form.id + '" name="' + form.id + '"' + (form.cls ? ' class="' + form.cls + '"' : "") +
' method="' + form.method + '"' + ' enctype="' + (form.enctype ? form.enctype : "multipart/form-data") + '"' + ' action="' + form.action + '">' +
'<input type="hidden" value="' + form.id + '" name="form[id]"/>' +
- '<header class="form-header">' +
- '<h2>' + t(form.title) + '</h2>' +
- '</header>' +
+ '<legend>' + t(form.title) + '</legend>' +
'<div class="form-container">' +
(form.tabs ? this.formTabs(form.sections) : '') +
- '<div class="form-fields' + (form.tabs ? ' tab-container' : '') + '">'
+ '<fieldset class="form-fields' + (form.tabs ? ' tab-container' : '') + '">'
);
};
@@ -806,7 +804,7 @@ me.start_form = function (form) {
* @returns {String}
*/
me.end_form = function (form) {
- return '</div></div></form>';
+ return '</fieldset></div></form>';
};
@@ -845,7 +843,7 @@ me.render_sections = function (form, values) {
me.render_buttons = function (buttons) {
var self = this;
- var buttonsOutput = '<div class="actions">';
+ var buttonsOutput = '<div class="row actions">';
buttons.forEach(function (field) {
buttonsOutput += self.elementTypes[field.tag || field.type].render(field);
View
@@ -254,6 +254,9 @@ CalipsoMenu.prototype.childrenEndTag = function () {
return "</ul>";
};
+CalipsoMenu.prototype.childrenIcon = function () {
+ return "<i class='icon-download' ";
+}
/**
* Locate selected paths based on current request
*/
@@ -24,7 +24,7 @@
<article class="admin-body">
- <header><h1><%= t("Create Admin User") %></h1></header>
+ <header class="centred"><h1><%= t("Create Admin User") %></h1></header>
<p>We need to create an administrator account for your site to safely manage content. Please provide the following
information:</p>
@@ -1,8 +1,8 @@
<% contents.forEach(function(item) { %>
-<div class='content-list-item content-list-item-<%- item.status %> content-type-<%- item.contentType %>'>
+<section class='content-list-item content-list-item-<%- item.status %> content-type-<%- item.contentType %>'>
<h2><a href='/<%= item.alias %>.html'><%- item.title %></a></h2>
<p><%- item.teaser %> ... <a href='/<%= item.alias %>.html'>more</a></p>
-</div>
+</section>
<% }); %>
<%- pager %>
@@ -1,7 +1,10 @@
<div class='asset-item'>
<h2><a href='/<%= content.alias %>.html'><%- content.title %></a></h2>
- <p class='by'>By <a href='/user/profile/<%- content.author %>'><%- content.displayAuthor.name %></a></small>
+ <p class='by'>By
+ <a href='/user/profile/<%- content.author %>'>
+ <small><%- content.displayAuthor.name %></small>
+ </a></p>
<p class='status'><%- content.status %></p>
@@ -10,22 +10,22 @@
<link rel="stylesheet" href="/css/admin-menu.css"/>
</head>
<body>
-<div id="adminMenu">
+<nav class="admin-menu row extended-height">
<%- admin %>
-</div>
+</nav>
<div id="container">
<div id="header">
<%- header %>
</div>
- <div id="adminToolbar">
+ <nav class="adminToolbar">
<%- getMenu('adminToolbar') %>
- </div>
+ </nav>
<div id="body">
<!--PAGE_BODY_START-->
<%- body %>
<!--PAGE_BODY_END-->
</div>
- <div id="sidePanel">
+ <div class="sidepanel threecol last">
<%- sidePanel %>
</div>
<div id="footer">
Oops, something went wrong.

0 comments on commit b46b380

Please sign in to comment.