[Pkg-javascript-commits] [rebar.js] 01/05: New upstream version 0.3.2~dfsg1
Alexandre Viau
aviau at moszumanska.debian.org
Mon Apr 10 20:09:46 UTC 2017
This is an automated email from the git hooks/post-receive script.
aviau pushed a commit to branch master
in repository rebar.js.
commit 87c43060beeaf217ef41d713aff780c7b3880a90
Author: aviau <alexandre at alexandreviau.net>
Date: Mon Apr 10 14:36:28 2017 -0400
New upstream version 0.3.2~dfsg1
---
bower.json | 10 +++++---
index.html | 21 ++++++++++++++--
less/config.less | 22 ++++++++++-------
less/rebar/buttons.less | 4 +++
less/rebar/clearing.less | 8 ++++--
less/rebar/navigation.less | 0
less/rebar/typography.less | 61 +++++++++++++++++++++++++++++++++++++---------
7 files changed, 97 insertions(+), 29 deletions(-)
diff --git a/bower.json b/bower.json
index 2278577..073b1a2 100644
--- a/bower.json
+++ b/bower.json
@@ -1,10 +1,12 @@
{
"name": "Rebar",
- "version": "0.3.1",
+ "version": "0.3.2",
"homepage": "https://brennannovak.com/work/rebar",
"authors": [
"Brennan Novak https://brennannovak.com",
- "Edward Hotchkiss http://github.com/edwardhotchkiss"
+ "Edward Hotchkiss http://github.com/edwardhotchkiss",
+ "Alexandre Viau http://www.alexandreviau.net",
+ "Jocelyn Delalande http://jocelyn.delalande.fr"
],
"description": "A lightweight HTML5 / CSS3 framework for making responsive websites, built using the LESS preprocessor",
"main": "index.html",
@@ -33,6 +35,6 @@
],
"dependencies": {
"animate.css": "~3.1.0",
- "less-elements": "master"
+ "less-elements-old": "~1.0.0"
}
-}
\ No newline at end of file
+}
diff --git a/index.html b/index.html
index dbaab72..53dbf8a 100644
--- a/index.html
+++ b/index.html
@@ -325,6 +325,23 @@
</blockquote>
</div>
</div>
+ <div class="row">
+ <div class="two-thirds">
+<pre>
+Here is some text inside a <pre> element.
+</pre>
+ <p><em class="text-detail">*Note, it needs to be flush against edge of document, as the <pre> element</em></p>
+ <p>Here is some JS code inline <code> function() { alert('Halló World') }</code> which is located inside of a <code>code</code> element with.</p>
+<pre><code>{
+ "hello": "halló",
+ "i am for code": "here is my structure"
+ "actually data" : {
+ "inside of elements" : ["pre", "code"]
+ }
+}
+</code></pre>
+ </div>
+ </div>
</div>
<hr>
@@ -410,7 +427,7 @@
<input type="submit" class="button-secondary" onclick="javascript:alert('Add button-secondary class')" value="Button Secondary">
<input type="reset" class="button-info" onclick="javascript:alert('Add button-info class')" value="Button Info">
<input type="button" class="button-alert" onclick="javascript:alert('Add button-alert class')" value="Button Alert">
- <button href="#buttons" class="button-warning" onclick="javascript:alert('Add button-warning class')">Button Warning</button>
+ <button class="button-warning" onclick="javascript:alert('Add button-warning class')">Button Warning</button>
</div>
@@ -421,7 +438,7 @@
<input type="submit" class="button-secondary button-small" onclick="javascript:alert('Add button-secondary button-small class')" value="Small Secondary">
<input type="reset" class="button-info button-small" onclick="javascript:alert('Add button-info button-small class')" value="Small Info">
<input type="button" class="button-alert button-small" onclick="javascript:alert('Add button-alert button-small class')" value="Small Alert">
- <button href="#buttons" class="button-warning button-small" onclick="javascript:alert('Add button-warning button-small class')">Small Warning</button>
+ <button class="button-warning button-small" onclick="javascript:alert('Add button-warning button-small class')">Small Warning</button>
</div>
</div>
<hr>
diff --git a/less/config.less b/less/config.less
index b458bed..98b68fd 100644
--- a/less/config.less
+++ b/less/config.less
@@ -7,7 +7,7 @@
@white: #FFFFFF;
@black: #333333;
@gray: #b7bfc8;
- @grayLight: #E6E6E6;
+ @grayLight: #E9E9E9;
@grayDark: #656E77;
@blue: #0A87BF;
@brown: #826f69;
@@ -54,7 +54,7 @@
@text-color: #333333;
@text-color-light: #999999;
- @em-font-style: @text-font-family-italic;
+ @em-font-style: italic;
@strong-font-family: @text-font-family-bold;
@strong-font-weight: normal;
@@ -66,13 +66,17 @@
@pre-margin-bottom: 20px;
@pre-background: @grayLight;
@pre-color: @black;
- @pre-padding: 2px 6px;
+ @pre-padding: 10px 15px;
@pre-border: 1px solid @gray;
@pre-border-radius: 3px;
- @pre-font-family: 'Courier';
+ @pre-font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
@pre-font-size: 14px;
- @pre-font-weight: bold;
+ @pre-font-weight: normal;
+ @code-font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
+ @code-font-size: 14px;
+ @code-font-weight: normal;
+ @code-padding: 2px 5px;
/* Links */
@@ -97,7 +101,7 @@
@headings-size-h5: 24px;
@headings-size-h6: 18px;
@headings-line-height: 1px;
- @headings-margin-bottom: 0px;
+ @headings-margin-bottom: @base-margin-bottom;
/* Navigation */
@@ -184,7 +188,7 @@
background: @background;
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.4), 0 0px 0px rgba(0, 0, 0, 0.2);
}
-
+
.button-colors-hover(@border-color, @background) {
border-color: @border-color;
background-color: @background;
@@ -197,9 +201,9 @@
}
@btn-color: @white;
- @btn-font-family: @text-font-family-semibold;
+ @btn-font-family: @text-font-family-bold;
@btn-font-size: 16px;
- @btn-font-weight: bold;
+ @btn-font-weight: normal;
@btn-margin: 0px;
@btn-padding: 5px 15px;
diff --git a/less/rebar/buttons.less b/less/rebar/buttons.less
index 22addde..a26146e 100644
--- a/less/rebar/buttons.less
+++ b/less/rebar/buttons.less
@@ -51,7 +51,11 @@
/* Primary */
+ button,
button.button-primary,
+ input[type="submit"],
+ input[type="reset"],
+ input[type="button"],
input[type="submit"].button-primary,
input[type="reset"].button-primary,
input[type="button"].button-primary,
diff --git a/less/rebar/clearing.less b/less/rebar/clearing.less
index c5b1a6d..384fba1 100644
--- a/less/rebar/clearing.less
+++ b/less/rebar/clearing.less
@@ -45,12 +45,16 @@
.left { float: left; }
.center { margin-left: auto !important; margin-right: auto !important; }
.right { float: right; }
- .vertical { vertical-align: middle !important; }
+ .top { vertical-align: top !important; }
+ .middle { vertical-align: middle !important; }
+ .bottom { vertical-align: bottom !important; }
.text-left { text-align: left !important; }
.text-center { text-align: center !important; }
.text-right { text-align: right !important; }
-
+ .text-top { vertical-align: text-top !important; }
+ .text-bottom { vertical-align: text-bottom !important; }
+
/* Display */
diff --git a/less/rebar/navigation.less b/less/rebar/navigation.less
old mode 100755
new mode 100644
diff --git a/less/rebar/typography.less b/less/rebar/typography.less
index 2b0379f..c9a2bd2 100644
--- a/less/rebar/typography.less
+++ b/less/rebar/typography.less
@@ -11,12 +11,12 @@
}
h1 a, h2 a, h3 a, h4 a, h5 a, h6 a { font-weight: inherit; }
- h1 { font-size: @headings-size-h1; line-height: (@headings-size-h1 * @headings-line-height); margin-bottom: (@base-margin-bottom + @headings-margin-bottom); }
- h2 { font-size: @headings-size-h2; line-height: (@headings-size-h2 * @headings-line-height); margin-bottom: (@base-margin-bottom + @headings-margin-bottom); }
- h3 { font-size: @headings-size-h3; line-height: (@headings-size-h3 * @headings-line-height); margin-bottom: (@base-margin-bottom + @headings-margin-bottom); }
- h4 { font-size: @headings-size-h4; line-height: (@headings-size-h4 * @headings-line-height); margin-bottom: (@base-margin-bottom + @headings-margin-bottom); }
- h5 { font-size: @headings-size-h5; line-height: (@headings-size-h5 * @headings-line-height); margin-bottom: (@base-margin-bottom + @headings-margin-bottom); }
- h6 { font-size: @headings-size-h6; line-height: (@headings-size-h6 * @headings-line-height); margin-bottom: (@base-margin-bottom + @headings-margin-bottom); }
+ h1 { font-size: @headings-size-h1; line-height: (@headings-size-h1 * @headings-line-height); margin-bottom: @headings-margin-bottom; }
+ h2 { font-size: @headings-size-h2; line-height: (@headings-size-h2 * @headings-line-height); margin-bottom: @headings-margin-bottom; }
+ h3 { font-size: @headings-size-h3; line-height: (@headings-size-h3 * @headings-line-height); margin-bottom: @headings-margin-bottom; }
+ h4 { font-size: @headings-size-h4; line-height: (@headings-size-h4 * @headings-line-height); margin-bottom: @headings-margin-bottom; }
+ h5 { font-size: @headings-size-h5; line-height: (@headings-size-h5 * @headings-line-height); margin-bottom: @headings-margin-bottom; }
+ h6 { font-size: @headings-size-h6; line-height: (@headings-size-h6 * @headings-line-height); margin-bottom: @headings-margin-bottom; }
.subheader { color: #777; }
@@ -53,13 +53,17 @@
/* Pre & Code */
- code,
+ pre {
+ word-wrap: normal;
+ display: block;
+ padding: @pre-padding;
+ }
+
pre,
.pre {
margin-bottom: @pre-margin-bottom;
background: @pre-background;
color: @pre-color;
- padding: @pre-padding;
border: @pre-border;
border-radius: @pre-border-radius;
font-family: @pre-font-family;
@@ -67,7 +71,40 @@
font-weight: @pre-font-weight;
}
- code,
- pre {
- display: inline-block;
- }
\ No newline at end of file
+ code {
+ display: inline;
+ border: @pre-border;
+ border-radius: @pre-border-radius;
+ background: @pre-background;
+ padding: @code-padding;
+ font-family: @code-font-family;
+ font-size: 70%;
+ font-weight: @code-font-weight;
+ }
+
+ pre code {
+ border: 0px;
+ font-size: 100%;
+ }
+
+
+/* Special Classes */
+
+ .text-detail {
+ color: @gray;
+ }
+
+ a.link-detail,
+ a.link-detail:visited {
+ color: @gray;
+ font-weight: normal !important;
+ }
+
+ a.link-detail:hover {
+ color: @grayDark;
+ }
+
+ a.disabled {
+ pointer-events: none;
+ cursor: default;
+ }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/rebar.js.git
More information about the Pkg-javascript-commits
mailing list