Permalink
Browse files

fixing the mess I made with git Conflicts

  • Loading branch information...
1 parent b49b974 commit a2c91d0864ba38e1fbca20d2bf27360f45b8dbca @joshuagatcke joshuagatcke committed Mar 9, 2012
Showing with 1 addition and 10 deletions.
  1. +0 −4 css/kickstart-forms.css
  2. +1 −1 elements.html
  3. +0 −5 js/kickstart.js
@@ -123,13 +123,9 @@ box-sizing: border-box;
a.button:focus,
select:focus,
input[type="file"]:focus,
-<<<<<<< HEAD:css/kickstart-forms.css
- input[type="password"]:focus{
-=======
input[type="password"]:focus,
.rte-editor:focus,
textarea.rte:focus{
->>>>>>> dev:css/kickstart-forms.css
-webkit-box-shadow: 0 0 7px #6DB9FF;
-moz-box-shadow : 0 0 7px #6DB9FF;
-o-box-shadow : 0 0 7px #6DB9FF;
View
@@ -1791,7 +1791,7 @@ <h3 id="forms">Forms</h3>
<textarea id="textarea1" placeholder="Placeholder Text"></textarea>
<label for="rte1">Rich Text Editor</label>
- <textarea id="rte1" class="rte">Test Content</textarea>
+ <textarea id="rte1" class="rte">This Rich Text Editor is meant as a placeholder for now. Does not function in IE.</textarea>
<button type="submit">Submit</button>
</form>
View
@@ -391,13 +391,8 @@ jQuery(document).ready(function($){
var div = document.createElement('div'); div.className="inner";
while (o.firstChild) div.appendChild(o.firstChild);
o.appendChild(div);
-<<<<<<< HEAD
}
);
-=======
- }
- );
->>>>>>> RTE first pass, general updates.
$('pre').addClass('prettyprint');prettyPrint();
});

0 comments on commit a2c91d0

Please sign in to comment.