Code

Merge from dev branch#53

Code

Open

mendozagioo wants to merge 54 commits intocivica-digital:mastercivica-digital/me-informo:masterfrom CodeandoMexico:devCodeandoMexico/tu-plataforma-abierta:devCopy head branch name to clipboard

+4,292-4,539

Commits

Commits on Jun 7, 2016

• Update README.md

  Show description for 92e6ec1
  miguelsalazar

  committed
  92e6ec1

• Update README.md

  miguelsalazar

  committed
  431d87c

Commits on Jun 8, 2016

• Añade breve guía para contribuir

  

  Mr. Outis

  committed
  b48f8c1

• Merge pull request #2 from MrOutis/master

  Show description for da216ac
  miguelsalazar

  committed
  da216ac

Commits on Jun 9, 2016

• Typos y formato en Contributing

  hecerinc

  committed
  170817f

• Update README.md

  miguelsalazar

  committed
  b074a8c

• Update README.md

  miguelsalazar

  committed
  883e357

Commits on Jun 13, 2016

• Update README.md

  miguelsalazar

  authored
  1b5c132

Commits on Jul 1, 2016

• Button resizing fixed for small screens

  mendozagioo

  committed
  dde359b

• Responsive progressbar fixed

  mendozagioo

  committed
  be37e5f

• Information granted box was changed for mobile and desktop screens

  mendozagioo

  committed
  e74f587

Commits on Jul 28, 2016

• Merged of CodeandoMexico in master branch

  mendozagioo

  committed
  68b9977

Commits on Aug 2, 2016

• Innecesary files because was changed for new files with .html.haml extensions

  mendozagioo

  committed
  6aff324

• Sass structure was changed, is a proposal to be clearer and scalable

  mendozagioo

  committed
  6df672f

Commits on Aug 5, 2016

• Merge pull request #7 from mendozagioo/master

  Show description for d5e7c4f
  hecerinc

  authored
  d5e7c4f

• Merge pull request #3 from hecerinc/master

  Show description for 922b91c
  hecerinc

  authored
  922b91c

• FontAwesome url, fixed

  mendozagioo

  committed
  76aa1d4

• Merged from CodeandoMexico -master branch-

  mendozagioo

  committed
  72d5135

• Link's styles fixed -with underline on hover-

  mendozagioo

  committed
  5dfd07c

Commits on Aug 7, 2016

• Switched to Rails 5

  

  Hector Rincon

  committed
  4135ddb

• Link README to CONTRIBUTING

  

  Hector Rincon

  committed
  168f9d3

Commits on Aug 9, 2016

• Merge branch 'dev'

  

  Hector Rincon

  committed
  94697d6

Commits on Aug 10, 2016

• Ignore Desktop Services Store of mac

  mendozagioo

  committed
  88589ae

• Adding different class for each view into body-tag, similar to old version with middleman

  mendozagioo

  committed
  d6201ba

• Navigation's link styles and banner's link styles was fixed

  mendozagioo

  committed
  71ae009

• Third party libraries was moved to vendor path

  mendozagioo

  committed
  9869c0c

• Merge pull request #9 from CodeandoMexico/dev

  Show description for 2a3b242
  mendozagioo

  authored
  2a3b242

• Fonts changed to vendor path

  mendozagioo

  committed
  457e235

• Changing FontAwesome inside gemfile

  mendozagioo

  committed
  73752d0

• Merge pull request #10 from CodeandoMexico/dev

  Show description for 62759bb
  mendozagioo

  authored
  62759bb

• Update README.md

  miguelsalazar

  authored
  e549029

Commits on Aug 25, 2016

• Elements modified to be clearer and separated of componenets

  mendozagioo

  committed
  b083a9d

• Components modified to be clearer and separated of elements

  mendozagioo

  committed
  3c74833

• Grid added to be more consistent to each view

  mendozagioo

  committed
  e698ee6

• Functions was added to make grid components and in the future create more structure for componenets

  mendozagioo

  committed
  7fb3a75

• Most elements was changed to be more consistent to each view and remove unnecessary structure

  mendozagioo

  committed
  8492740

• Merged from dev

  mendozagioo

  committed
  2f32255

Commits on Sep 17, 2016

• Icon added to background of slect tag

  mendozagioo

  committed
  d7a64ce

• Work in progress to have reusable components on sass

  mendozagioo

  committed
  93323d5

• Merged from dev

  mendozagioo

  committed
  0396f2d

Commits on Sep 27, 2016

• More work to have reusable components on sass

  mendozagioo

  committed
  a3981ba

• Buttons and utilities added like elements

  mendozagioo

  committed
  6ea92c2

• Header of information granted was fixed to make like a component

  mendozagioo

  committed
  a2e0b3d

• Request view was added (only front-end work)

  mendozagioo

  committed
  3aeeb00

• Merge branch 'dev' of github.com:CodeandoMexico/tu-plataforma-abierta

  Show description for 1a1a19c
  mendozagioo

  committed
  1a1a19c

Commits on Sep 28, 2016

• Fix the select background

  mendozagioo

  committed
  40170c1

• Selector file was fixed

  mendozagioo

  committed
  bff8357

• Components interactions added to manage simple interactions

  mendozagioo

  committed
  4bac02a

• Merge branch 'dev' of github.com:CodeandoMexico/tu-plataforma-abierta

  Show description for b387045
  mendozagioo

  committed
  b387045

Commits on Oct 4, 2016

• New SASS's component added

  mendozagioo

  committed
  be07d62

• Menu fixed and made for mobile screens

  mendozagioo

  committed
  af5be34

• New logo added and the navigation component was modified

  mendozagioo

  committed
  e882341

Commits on Oct 6, 2016

• Footer modified

  Show description for 4987280
  mendozagioo

  committed
  4987280

Commits on Oct 13, 2016

• Link added to go to create request in the home buttom named 'Crear nueva solicitud de información'

  mendozagioo

  committed
  a0d76da