comenzando novedades(terminando presentacion)

This commit is contained in:
2019-02-08 16:28:09 -06:00
parent ea6b7a26c8
commit 230789d82a
4 changed files with 62 additions and 58 deletions
+36 -51
View File
@@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="6b925d8f-3741-4302-aa30-691568703891" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/componentes/socialmedia.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/componentes/header.php" beforeDir="false" afterPath="$PROJECT_DIR$/componentes/header.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/componentes/novedades.php" beforeDir="false" afterPath="$PROJECT_DIR$/componentes/novedades.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/estilo.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/estilo.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
</list>
@@ -17,55 +15,28 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/componentes/header.php">
<entry file="file://$PROJECT_DIR$/css/estilo.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<caret line="53" column="120" selection-start-line="53" selection-start-column="120" selection-end-line="53" selection-end-column="120" />
<folding>
<element signature="n#style#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#ul#0;n#li#4;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#0;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#4;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#5;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#6;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#7;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#8;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#9;n#ul#0;n#li#0;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/componentes/socialmedia.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="26" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" />
<state relative-caret-position="556">
<caret line="168" column="5" lean-forward="true" selection-start-line="168" selection-start-column="5" selection-end-line="168" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/estilo.css">
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="631">
<caret line="157" column="29" selection-start-line="157" selection-start-column="29" selection-end-line="157" selection-end-column="29" />
<state relative-caret-position="66">
<caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.php">
<entry file="file://$PROJECT_DIR$/componentes/novedades.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="40" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
<state relative-caret-position="22">
<caret line="1" column="49" selection-start-line="1" selection-start-column="49" selection-end-line="1" selection-end-column="49" />
</state>
</provider>
</entry>
@@ -99,9 +70,10 @@
<option value="$PROJECT_DIR$/componentes/footer.php" />
<option value="$PROJECT_DIR$/componentes/carrusel.php" />
<option value="$PROJECT_DIR$/componentes/header.php" />
<option value="$PROJECT_DIR$/index.php" />
<option value="$PROJECT_DIR$/componentes/socialmedia.php" />
<option value="$PROJECT_DIR$/componentes/novedades.php" />
<option value="$PROJECT_DIR$/css/estilo.css" />
<option value="$PROJECT_DIR$/index.php" />
</list>
</option>
</component>
@@ -124,6 +96,11 @@
<item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
<item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="portal_editorial" type="b2602c69:ProjectViewProjectNode" />
<item name="portal_editorial" type="462c0819:PsiDirectoryNode" />
<item name="componentes" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
@@ -164,15 +141,16 @@
<option name="presentableId" value="Default" />
<updated>1549577189409</updated>
<workItem from="1549577191487" duration="16665000" />
<workItem from="1549649255326" duration="7327000" />
<workItem from="1549649255326" duration="9915000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="23992000" />
<option name="totallyTimeSpent" value="26580000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-8" width="1296" height="1010" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Favorites" order="0" side_tool="true" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.15210356" />
@@ -231,16 +209,16 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<entry file="file://$PROJECT_DIR$/componentes/socialmedia.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="40" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
<state relative-caret-position="88">
<caret line="4" column="26" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/componentes/header.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="169">
<state relative-caret-position="902">
<caret line="53" column="120" selection-start-line="53" selection-start-column="120" selection-end-line="53" selection-end-column="120" />
<folding>
<element signature="n#style#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#nav#0;n#body#0;n#html#0;n#!!top" expanded="true" />
@@ -263,17 +241,24 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/componentes/socialmedia.php">
<entry file="file://$PROJECT_DIR$/componentes/novedades.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="88">
<caret line="4" column="26" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" />
<state relative-caret-position="22">
<caret line="1" column="49" selection-start-line="1" selection-start-column="49" selection-end-line="1" selection-end-column="49" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/estilo.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="631">
<caret line="157" column="29" selection-start-line="157" selection-start-column="29" selection-end-line="157" selection-end-column="29" />
<state relative-caret-position="556">
<caret line="168" column="5" lean-forward="true" selection-start-line="168" selection-start-column="5" selection-end-line="168" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
<caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
</state>
</provider>
</entry>
+4 -7
View File
@@ -1,7 +1,4 @@
<?php
/**
* Created by PhpStorm.
* User: Gabriel Fuentes
* Date: 08/02/2019
* Time: 03:44 PM
*/
<div class="container">
<div class="nov"><p class="n">Novedades Semestrales</p></div>
<div class="lin"></div>
</div>
+19
View File
@@ -158,3 +158,22 @@
transform: translate(0,-8px);
}
/*Novedades*/
.nov{
width: 45%;
height: 60px;
background-color: #404040;
border-radius: 30px 30px 0px 0px;
margin-left: 27%;
}
.lin{
height: 5px;
background-color: #404040;
}
.n{
color: #ffffff;
text-align: center;
font-size: 33px;
padding-top: 13px;
}
+3
View File
@@ -1,5 +1,8 @@
<?php
include("componentes/header.php");
include("componentes/carrusel.php");
echo "<br><br>";
include("componentes/novedades.php");
include ("componentes/socialmedia.php");
echo "<br><br><br>";
include("componentes/footer.php");