Index: lams_central/web/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/authoring/authoring.jsp,v
diff -u -r1.6.2.25 -r1.6.2.26
--- lams_central/web/authoring/authoring.jsp 2 Jun 2016 14:50:41 -0000 1.6.2.25
+++ lams_central/web/authoring/authoring.jsp 4 Jul 2016 05:27:54 -0000 1.6.2.26
@@ -438,9 +438,7 @@
-
+
Index: lams_central/web/css/authoring.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/authoring.css,v
diff -u -r1.30.2.6 -r1.30.2.7
--- lams_central/web/css/authoring.css 5 Feb 2016 09:53:04 -0000 1.30.2.6
+++ lams_central/web/css/authoring.css 4 Jul 2016 05:27:54 -0000 1.30.2.7
@@ -435,4 +435,38 @@
#canvas {
overflow: auto;
vertical-align: top;
-}
\ No newline at end of file
+}
+
+/** CKEditor Inline */
+.cke_textarea_inline {
+ /* From bootstrap form-control */
+ display: block;
+ padding: 6px 12px;
+ color: #555;
+ background-color: #fff;
+ background-image: none;
+ border: 1px solid #ccc;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+ -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
+ -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+ transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s; border: 1px solid #c1c1c1;
+ /* LAMS */
+ width: 90%;
+ min-height: 100px;
+ -webkit-appearance: textfield;
+}
+
+.cke_textarea_inline:focus{
+ /* From bootstrap form-control */
+ border-color: #66afe9;
+ outline: 0;
+ -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+ box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+}
+
+.cke_reset_all {
+ width: 70% !important;
+}
+