Skip to content

Commit

Permalink
Merge pull request #55 from hernanramirez/master
Browse files Browse the repository at this point in the history
queda pendiente solventar los problemas con el estilo de los botones superiores cc/ @hernanramirez @mamcode
  • Loading branch information
Carlos Gustavo Ruiz committed Feb 1, 2016
2 parents ae5544d + ef01077 commit fb22a82
Show file tree
Hide file tree
Showing 61 changed files with 439 additions and 63 deletions.
22 changes: 13 additions & 9 deletions assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@ a:focus {
margin-bottom: 0px;
}

.navbarwrap {
min-width: 600px;
}

.navbar-brand {
font-family: 'Flux', sans-serif;
font-weight: 900;
Expand All @@ -119,11 +115,6 @@ a:focus {
padding-left: 15px;
}

.navbar-buttons {
padding-top: 15px;
float: right;
}

.navbar-default {
background-color: #1C3B56;
border-color: transparent;
Expand Down Expand Up @@ -226,3 +217,16 @@ a:focus {
#footerwrap h4 {
color: #ffffff;
}

/* Ajuste de colores de la barra de navegación */
.navbar-default .navbar-nav > li > a {
color: #fff;
}
.navbar-default .navbar-nav > li > a:hover,
.navbar-default .navbar-nav > li > a:focus,
.navbar-default .navbar-nav > li > a:active,
.navbar-default .navbar-nav > li > a.active {
color: #fff;
background-color: #2D628D;
border-color: #2D628D;
}
File renamed without changes.
7 changes: 7 additions & 0 deletions assets/js/bootstrap.min.js

Large diffs are not rendered by default.

51 changes: 51 additions & 0 deletions assets/js/ie-emulation-modes-warning.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
// NOTICE!! DO NOT USE ANY OF THIS JAVASCRIPT
// IT'S JUST JUNK FOR OUR DOCS!
// ++++++++++++++++++++++++++++++++++++++++++
/*!
* Copyright 2014-2015 Twitter, Inc.
*
* Licensed under the Creative Commons Attribution 3.0 Unported License. For
* details, see https://creativecommons.org/licenses/by/3.0/.
*/
// Intended to prevent false-positive bug reports about Bootstrap not working properly in old versions of IE due to folks testing using IE's unreliable emulation modes.
(function () {
'use strict';

function emulatedIEMajorVersion() {
var groups = /MSIE ([0-9.]+)/.exec(window.navigator.userAgent)
if (groups === null) {
return null
}
var ieVersionNum = parseInt(groups[1], 10)
var ieMajorVersion = Math.floor(ieVersionNum)
return ieMajorVersion
}

function actualNonEmulatedIEMajorVersion() {
// Detects the actual version of IE in use, even if it's in an older-IE emulation mode.
// IE JavaScript conditional compilation docs: https://msdn.microsoft.com/library/121hztk3%28v=vs.94%29.aspx
// @cc_on docs: https://msdn.microsoft.com/library/8ka90k2e%28v=vs.94%29.aspx
var jscriptVersion = new Function('/*@cc_on return @_jscript_version; @*/')() // jshint ignore:line
if (jscriptVersion === undefined) {
return 11 // IE11+ not in emulation mode
}
if (jscriptVersion < 9) {
return 8 // IE8 (or lower; haven't tested on IE<8)
}
return jscriptVersion // IE9 or IE10 in any mode, or IE11 in non-IE11 mode
}

var ua = window.navigator.userAgent
if (ua.indexOf('Opera') > -1 || ua.indexOf('Presto') > -1) {
return // Opera, which might pretend to be IE
}
var emulated = emulatedIEMajorVersion()
if (emulated === null) {
return // Not IE
}
var nonEmulated = actualNonEmulatedIEMajorVersion()

if (emulated !== nonEmulated) {
window.alert('WARNING: You appear to be using IE' + nonEmulated + ' in IE' + emulated + ' emulation mode.\nIE emulation modes can behave significantly differently from ACTUAL older versions of IE.\nPLEASE DON\'T FILE BOOTSTRAP BUGS based on testing in IE emulation modes!')
}
})();
23 changes: 23 additions & 0 deletions assets/js/ie10-viewport-bug-workaround.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*!
* IE10 viewport hack for Surface/desktop Windows 8 bug
* Copyright 2014-2015 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/

// See the Getting Started docs for more information:
// http://getbootstrap.com/getting-started/#support-ie10-width

(function () {
'use strict';

if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
var msViewportStyle = document.createElement('style')
msViewportStyle.appendChild(
document.createTextNode(
'@-ms-viewport{width:auto!important}'
)
)
document.querySelector('head').appendChild(msViewportStyle)
}

})();
File renamed without changes.
50 changes: 35 additions & 15 deletions comunidad.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,35 @@
<body>

<!-- Fixed navbar -->
<div class="navbar navbar-default navbar-fixed-top" role="navigation">
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbarwrap">
<div class="navbar-header">
<a class="navbar-brand" href="./index.html">pyve</a><br />
<div class="navbar-tagline">Entusiastas venezolanos de python y todas sus hierbas derivadas.</div>
</div>
<div class="navbar-logo"><img title="pyve Logo" src="./assets/img/pyve-logo.png" width="90" /></div>
<div class="navbar-buttons">
<a href="./python.html" class="btn btn-theme-navbar">Python</a>
<a href="./comunidad.html" class="btn btn-theme-navbar">Comunidad</a>
<a href="#" class="btn btn-theme-navbar">Fundación</a>
<a href="#" class="btn btn-theme-navbar">Blog</a>
<a href="#" class="btn btn-theme-navbar">Contacto</a>
</div>
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="./index.html">pyve</a>
</div>
<div id="navbar" class="navbar-collapse collapse navbar-right">
<ul class="nav navbar-nav">
<li><a href="./python.html" >Python</a></li>
<li><a class="active" href="./comunidad.html" >Comunidad</a></li>
<li><a href="#fundacion" >Fundación PyVE</a></li>
<li><a href="#contacto">Contacto</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Eventos <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="./eventos/PyTatuy2016/index.html">PyTatuy 2016</a></li>
</ul>
</li>
</ul>

<div class="navbar-logo"><img title="pyve Logo" src="./assets/img/pyve-logo.png" width="90" /></div>
</div><!--/.nav-collapse -->
</div>
</div>
</nav>

<div class="themewrap">
<div class="container">
Expand Down Expand Up @@ -409,7 +420,16 @@ <h4>Reclutamiento</h4>
</div>
</div><!--/footerwrap -->

<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
<script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
<script src="./assets/js/bootstrap.min.js"></script>
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="./assets/js/ie10-viewport-bug-workaround.js"></script>


<script src="https://blueimp.github.io/Gallery/js/jquery.blueimp-gallery.min.js"></script>
<script src="./assets/js/bootstrap-image-gallery.min.js"></script>
<script src="./assets/js/avatar-snippet.js"></script>
Expand Down
Loading

0 comments on commit fb22a82

Please sign in to comment.