From 2d5efabade0164b78cc394d5adfba4b4c140fe6f Mon Sep 17 00:00:00 2001
From: Samu
Date: Sat, 29 Jun 2013 19:00:26 +0000
Subject: cambios en css y botones
---
diff --git a/EjercitarWeb/WebContent/Asignatura.jsp b/EjercitarWeb/WebContent/Asignatura.jsp
index 7e111a7..f7323eb 100644
--- a/EjercitarWeb/WebContent/Asignatura.jsp
+++ b/EjercitarWeb/WebContent/Asignatura.jsp
@@ -41,7 +41,8 @@
-
+
+
diff --git a/EjercitarWeb/WebContent/Concepto.jsp b/EjercitarWeb/WebContent/Concepto.jsp
index 84f3ce6..94cae20 100644
--- a/EjercitarWeb/WebContent/Concepto.jsp
+++ b/EjercitarWeb/WebContent/Concepto.jsp
@@ -58,7 +58,8 @@
-
+
+
diff --git a/EjercitarWeb/WebContent/Ejercicios.jsp b/EjercitarWeb/WebContent/Ejercicios.jsp
index f8475f5..335f48b 100644
--- a/EjercitarWeb/WebContent/Ejercicios.jsp
+++ b/EjercitarWeb/WebContent/Ejercicios.jsp
@@ -73,7 +73,8 @@
-
+
+
diff --git a/EjercitarWeb/WebContent/Tarea.jsp b/EjercitarWeb/WebContent/Tarea.jsp
index a3bf225..47c5f60 100644
--- a/EjercitarWeb/WebContent/Tarea.jsp
+++ b/EjercitarWeb/WebContent/Tarea.jsp
@@ -11,8 +11,8 @@
-
-
+
+
@@ -30,12 +30,13 @@
-
+
>
-
+
+
diff --git a/EjercitarWeb/WebContent/Tema.jsp b/EjercitarWeb/WebContent/Tema.jsp
index c75d7b1..775e646 100644
--- a/EjercitarWeb/WebContent/Tema.jsp
+++ b/EjercitarWeb/WebContent/Tema.jsp
@@ -26,21 +26,14 @@
-
-
-
-
+
-
+
+
diff --git a/EjercitarWeb/WebContent/concepto_ed.jsp b/EjercitarWeb/WebContent/concepto_ed.jsp
index 9a7c6ee..1aa74ee 100644
--- a/EjercitarWeb/WebContent/concepto_ed.jsp
+++ b/EjercitarWeb/WebContent/concepto_ed.jsp
@@ -62,8 +62,8 @@
-
-
+
+
diff --git a/EjercitarWeb/WebContent/css/estilo_ejercitar.css b/EjercitarWeb/WebContent/css/estilo_ejercitar.css
index b90f939..4101dc6 100644
--- a/EjercitarWeb/WebContent/css/estilo_ejercitar.css
+++ b/EjercitarWeb/WebContent/css/estilo_ejercitar.css
@@ -40,24 +40,24 @@ div#content
padding: 1em;
position:absolute;
top:80px;
-
+overflow: auto;
right:180px;
left:180px;
}
div#sidebar {
-width:160px;
-height:100%;
-top:100px;
-position:fixed;
-left:0;
+width: 160px;
+height: 100%;
+top: 100px;
+position: absolute;
+left: 0;
}
div#rsidebar {
-width:160px;
-height:100%;
-top:100px;
-position:fixed;
-right:0;
+width: 160px;
+height: 100%;
+top: 100px;
+position: absolute;
+right: 0;
}
diff --git a/EjercitarWeb/WebContent/css/grey.css b/EjercitarWeb/WebContent/css/grey.css
index c764dd3..97c8ba2 100644
--- a/EjercitarWeb/WebContent/css/grey.css
+++ b/EjercitarWeb/WebContent/css/grey.css
@@ -92,6 +92,7 @@ button, input[type=submit] {
background: -webkit-gradient(linear, left top, left 25, from(#FFFFFF), color-stop(4%, #EEEEEE), to(#FFFFFF));
background: -moz-linear-gradient(top, #FFFFFF, #EEEEEE 1px, #FFFFFF 25px);
padding: 10px;
+ text-align: left;
}
input[type=text]:hover, input[type=password]:hover, textarea:hover, input[type=submit]:hover, button:hover, input[type=radio]:hover:before, input[type=checkbox]:hover:before, select:hover {
-webkit-box-shadow: #666 0 0 3px;
diff --git a/EjercitarWeb/WebContent/css/img/agregar.png b/EjercitarWeb/WebContent/css/img/agregar.png
new file mode 100644
index 0000000..dbb1e94
--- /dev/null
+++ b/EjercitarWeb/WebContent/css/img/agregar.png
Binary files differ
diff --git a/EjercitarWeb/WebContent/css/img/eliminar.png b/EjercitarWeb/WebContent/css/img/eliminar.png
new file mode 100644
index 0000000..e6d7af0
--- /dev/null
+++ b/EjercitarWeb/WebContent/css/img/eliminar.png
Binary files differ
diff --git a/EjercitarWeb/WebContent/css/img/guardar.png b/EjercitarWeb/WebContent/css/img/guardar.png
new file mode 100644
index 0000000..e71398f
--- /dev/null
+++ b/EjercitarWeb/WebContent/css/img/guardar.png
Binary files differ
diff --git a/EjercitarWeb/WebContent/css/img/home.png b/EjercitarWeb/WebContent/css/img/home.png
new file mode 100644
index 0000000..dc25ef4
--- /dev/null
+++ b/EjercitarWeb/WebContent/css/img/home.png
Binary files differ
diff --git a/EjercitarWeb/WebContent/css/img/resultados.png b/EjercitarWeb/WebContent/css/img/resultados.png
new file mode 100644
index 0000000..be88409
--- /dev/null
+++ b/EjercitarWeb/WebContent/css/img/resultados.png
Binary files differ
diff --git a/EjercitarWeb/WebContent/login.jsp b/EjercitarWeb/WebContent/login.jsp
index 41465ae..f4a5f71 100644
--- a/EjercitarWeb/WebContent/login.jsp
+++ b/EjercitarWeb/WebContent/login.jsp
@@ -3,6 +3,7 @@
+
Login
-
-
diff --git a/EjercitarWeb/WebContent/templateCSS.jsp b/EjercitarWeb/WebContent/templateCSS.jsp
index 23efd37..3d8f886 100644
--- a/EjercitarWeb/WebContent/templateCSS.jsp
+++ b/EjercitarWeb/WebContent/templateCSS.jsp
@@ -25,10 +25,7 @@
addMouseOver(tbl);
/* make the table scrollable with a fixed header */
- $("table.scroll").createScrollableTable({
- width: '300px',
- height: '200px'
- });
+
});
@@ -59,10 +56,10 @@
-