This paper presents a new depth-integrated non-hydrostatic finite element model for simulating wave propagation, breaking and runup using a combination of discontinuous and continuous Galerkin methods. The formulation decomposes the depth-integrated non-hydrostatic equations into hydrostatic and non-hydrostatic parts. The hydrostatic part is solved with a discontinuous Galerkin finite element method to allow the simulation of discontinuous flows, wave breaking and runup. The non-hydrostatic part led to a Poisson type equation, where the non-hydrostatic pressure is solved using a continuous Galerkin method to allow the modeling of wave propagation and transformation. The model uses linear quadrilateral finite elements for horizontal velocities, water surface elevations and non-hydrostatic pressures approximations. A new slope limiter for quadrilateral elements is developed. The model is verified and validated by a series of analytical solutions and laboratory experiments.