summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimotej Lazar <timotej.lazar@fri.uni-lj.si>2016-03-02 15:22:19 +0100
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2016-03-02 15:22:19 +0100
commit96d7a97d80f882111e435e98c6965ad999596b52 (patch)
tree0f2277732a6aea1a5739a02a09d611bdf3bfda29
parent7c72a4efe48149c20b9a3e8bb7e547214301a9f3 (diff)
Minor HTML and CSS cleanups
-rw-r--r--css/codeq.css39
-rw-r--r--index.html8
-rw-r--r--js/codeq/problem_list.js2
3 files changed, 6 insertions, 43 deletions
diff --git a/css/codeq.css b/css/codeq.css
index 9b87baa..0603984 100644
--- a/css/codeq.css
+++ b/css/codeq.css
@@ -134,7 +134,7 @@ div#disabled {
/* modal screens*/
#screen-login, #screen-signup, #screen-change-password, #screen-settings, #screen-upgrade-to-aai {
- padding: 15px 0;
+ padding: 1em 0;
}
/* screen language */
@@ -142,9 +142,6 @@ div#disabled {
margin-top: 4em;
margin-bottom: 4em;
}
-#screen-language .col-lg-4 {
- cursor: pointer;
-}
#screen-language .col-lg-4 a {
color: inherit;
text-decoration: none;
@@ -287,11 +284,6 @@ h2.group-title a.view-solutions {
opacity: 0.75;
}
-.block > .scrollable-content-container {
- padding-left: 1em;
- padding-right: 1em;
-}
-
/***** responsiveness *****/
/* md & ld */
@media (min-width: 992px) {
@@ -375,10 +367,6 @@ h2.group-title a.view-solutions {
}
/* python */
- .quadrants.square-layout#screen-python.prof2 > * > .block {
- overflow: auto;
- min-height: 100%; height: 100%;
- }
/* instructions+hints */
.square-layout#screen-python .block-left {
min-width: 33%; width: 33%;
@@ -399,10 +387,6 @@ h2.group-title a.view-solutions {
}
/* robot */
- .quadrants.square-layout#screen-robot.prof2 > * > .block {
- overflow: auto;
- min-height: 100%; height: 100%;
- }
/* instructions+hints */
.square-layout#screen-robot .block-left {
min-width: 33%; width: 33%;
@@ -423,7 +407,6 @@ h2.group-title a.view-solutions {
}
/* END layouts */
-
.block-left, .block-right {
min-height: 100%; height: 100%;
}
@@ -432,12 +415,6 @@ h2.group-title a.view-solutions {
border-right: 1px solid #ddd;
}
- /* info */
- .block > .scrollable-content-container {
- height: 100%;
- overflow-y: auto;
- }
-
/* code_editor */
.block > .code_editor {
min-height: 100%;
@@ -517,16 +494,6 @@ h2.group-title a.view-solutions {
background: rgba(255,255,255,0.9);;
}
-/* status bar */
-ul.dropdown-menu a {
- cursor: pointer;
-}
-
-/* main screen */
-#screen-language a {
- cursor: pointer;
-}
-
/* problem index screen */
#screen-problem-list .language-description {
margin-bottom: 1em;
@@ -549,10 +516,6 @@ ul.dropdown-menu a {
list-style-type: none;
}
-#screen-problem-list a {
- cursor: pointer;
-}
-
#screen-problem-list ul.group-problems a::before {
color: gray;
content: '○  '; /* non-breaking spaces */
diff --git a/index.html b/index.html
index 0123903..b26db02 100644
--- a/index.html
+++ b/index.html
@@ -152,7 +152,7 @@
<div class="row">
<div class="col-md-12" style="padding: 0;">
<button type="button" class="pull-right" id="cancel-aai-login" style="position: absolute; top:10px; left:10px;" data-tkey="go_back">Go back</button>
- <iframe width="100%" height="100%" frameborder="0" scrolling="yes" allowtransparency="true" src="" id="aai-iframe"></iframe>
+ <iframe width="100%" height="100%" frameborder="0" scrolling="yes" allowtransparency="true" src="" id="aai-iframe"></iframe>
</div>
</div>
</div>
@@ -509,10 +509,10 @@
pattern="^(([0-9a-f]{0,4}:){1,7}[0-9a-f]{1,4}|([0-9]{1,3}\.){3}[0-9]{1,3})$" />
</div>
<div class="form-group" id="settings-layout-group">
- <span class="small" data-tkey="layout_select" >Layout</span>
+ <span class="small" data-tkey="layout_select">Layout</span>
<select class="form-control" id="settings-layout">
- <option value="line-layout" data-tkey="line_layout">Line</option>
- <option value="square-layout" data-tkey="square_layout">Square</option>
+ <option value="line-layout" data-tkey="line_layout">Line</option>
+ <option value="square-layout" data-tkey="square_layout">Square</option>
</select>
</div>
<div class="text-center">
diff --git a/js/codeq/problem_list.js b/js/codeq/problem_list.js
index 268276f..7f1343d 100644
--- a/js/codeq/problem_list.js
+++ b/js/codeq/problem_list.js
@@ -318,7 +318,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
problem_ids = groups[group].filter(function (pid) { return pid in attempts }),
link;
if (problem_ids.length > 0) {
- var link = $('<a class="view-solutions"><span class="glyphicon glyphicon-download-alt"></span></a>')
+ var link = $('<a href="#" class="view-solutions"><span class="glyphicon glyphicon-download-alt"></span></a>')
.on('click', function (e) {
e.preventDefault();
codeq.globalStateMachine.transition('solutions', problem_ids);